diff --git CMakeLists.txt CMakeLists.txt index b4d6cb3..0866443 100644 --- CMakeLists.txt +++ CMakeLists.txt @@ -10,11 +10,11 @@ cmake_minimum_required(VERSION 2.6) project(Intensity) -if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") message(STATUS "...Linux...") add_definitions (-DLINUX) set(CMAKE_CXX_FLAGS "-g -O1 -Wall -Werror") -else(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +else(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") message(STATUS "...OS X...") @@ -43,7 +43,7 @@ else(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") message(STATUS "Set up SDKs at: ${PLATFORM_SDK_A};${PLATFORM_SDK_B}") endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") add_subdirectory(src) diff --git src/client/CMakeLists.txt src/client/CMakeLists.txt index a4d7099..7552aaf 100644 --- src/client/CMakeLists.txt +++ src/client/CMakeLists.txt @@ -3,14 +3,17 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") include_directories(../thirdparty/v8/include) -link_directories(../../../src/thirdparty/v8) -link_directories(../../src/thirdparty/v8) +link_directories(${CMAKE_SOURCE_DIR}/src/thirdparty/v8) #add_definitions(-DUSE_JPEG2000) add_definitions (-DCLIENT) add_executable(Intensity_CClient ../engine/3dgui ../engine/blob ../engine/blend ../engine/menus ../engine/serverbrowser ../intensity/editing_system ../intensity/messages ../intensity/logging ../intensity/message_system ../intensity/system_manager ../intensity/python_wrap ../intensity/utility ../intensity/client_system ../intensity/client_engine_additions ../intensity/character_render ../fpsgame/fps ../fpsgame/server ../fpsgame/client ../fpsgame/entities ../fpsgame/render ../fpsgame/weapon ../shared/tools ../shared/geom ../engine/rendertext ../engine/material ../engine/octaedit ../engine/grass ../engine/physics ../engine/rendergl ../engine/worldio ../engine/texture ../engine/console ../engine/world ../engine/glare ../engine/renderva ../engine/normal ../engine/rendermodel ../engine/shadowmap ../engine/main ../engine/bih ../engine/octa ../engine/lightmap ../engine/water ../engine/shader ../engine/rendersky ../engine/cubeloader ../engine/renderparticles ../engine/octarender ../engine/server ../engine/client ../engine/dynlight ../engine/decal ../engine/sound ../engine/pvs ../engine/command ../intensity/engine_additions ../intensity/world_system ../intensity/targeting ../intensity/steering ../intensity/network_system ../intensity/script_engine_manager ../intensity/script_engine ../intensity/script_engine_v8 ../intensity/fpsclient_interface ../intensity/fpsserver_interface ../intensity/master ../intensity/intensity_gui ../shared/stream ../shared/zip ../engine/movie ../intensity/shared_module_members_boost ../fpsgame/scoreboard ${Extra_ClientServer_Sources}) target_link_libraries(Intensity_CClient enet v8 ${PYTHON_LIBRARIES} ${Boost_Python_Library} ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLSOUND_LIBRARY} ${OPENGL_LIBRARIES} ${ZLIB_LIBRARIES}) +if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + target_link_libraries(Intensity_CClient execinfo) +endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + if(${WIN32}) target_link_libraries(opengl32 glu32 ws2_32 winmm msvcrt user32 imagehlp) diff --git src/python/intensity/base.py src/python/intensity/base.py index b7aabd1..a6675a1 100755 --- src/python/intensity/base.py +++ src/python/intensity/base.py @@ -34,8 +34,9 @@ import os, sys, __main__, ConfigParser, shutil WINDOWS = sys.platform.find("win32") != -1 or sys.platform.find("win64") != -1 # ??? FIXME LINUX = sys.platform.find("linux") != -1 OSX = sys.platform.find("darwin") != -1 +FREEBSD = sys.platform.find("freebsd") != -1 -assert(WINDOWS or LINUX or OSX) +assert(WINDOWS or LINUX or OSX or FREEBSD) # # Version @@ -102,7 +103,7 @@ def get_home_subdir(): # Use default value if none given to us if HOME_SUBDIR is None: - if LINUX or OSX: + if LINUX or OSX or FREEBSD: HOME_SUBDIR = os.path.join( os.path.expanduser('~'), '.intensityengine_'+suffix ) elif WINDOWS: HOME_SUBDIR = os.path.join( os.path.expanduser('~'), 'intensityengine_'+suffix ) diff --git src/server/CMakeLists.txt src/server/CMakeLists.txt index 73d47cb..9fc2ef4 100644 --- src/server/CMakeLists.txt +++ src/server/CMakeLists.txt @@ -3,14 +3,16 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") include_directories(../thirdparty/v8/include) -link_directories(../../../src/thirdparty/v8) -link_directories(../../src/thirdparty/v8) +link_directories(${CMAKE_SOURCE_DIR}/src/thirdparty/v8) #add_definitions(-DUSE_JPEG2000) add_definitions (-DSERVER) add_executable(Intensity_CServer ../intensity/editing_system ../shared/tools ../engine/server ../engine/serverbrowser ../fpsgame/fps ../fpsgame/server ../fpsgame/client ../fpsgame/entities ../intensity/python_wrap ../intensity/system_manager ../intensity/message_system ../intensity/server_system ../intensity/logging ../intensity/messages ../intensity/utility ../engine/world ../engine/worldio ../intensity/engine_additions ../engine/command ../engine/octa ../engine/physics ../engine/rendermodel ../engine/normal ../engine/bih ../shared/geom ../engine/client ../intensity/world_system ../engine/octaedit ../intensity/steering ../intensity/targeting ../intensity/network_system ../intensity/script_engine_manager ../intensity/script_engine ../intensity/script_engine_v8 ../intensity/fpsserver_interface ../intensity/fpsclient_interface ../engine/octarender ../fpsgame/weapon ../intensity/master ../shared/stream ../engine/pvs ../engine/blend ../shared/zip ../intensity/shared_module_members_boost ../intensity/NPC ${Extra_ClientServer_Sources}) target_link_libraries(Intensity_CServer enet v8 ${PYTHON_LIBRARIES} ${Boost_Python_Library} ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLSOUND_LIBRARY} ${ZLIB_LIBRARIES}) +if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + target_link_libraries(Intensity_CServer execinfo) +endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") if(${WIN32}) target_link_libraries(ws2_32 winmm msvcrt opengl32)