From a5f479139c36b80d960643a287143575739bfe43 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alon@sanctity.(none)>
Date: Thu, 28 Jan 2010 09:53:59 +0200
Subject: [PATCH] BSD patch

---
 CMakeLists.txt               |  6 +++---
 COMPILE.txt                  |  7 +++++++
 src/client/CMakeLists.txt    | 11 +++++++----
 src/python/intensity/base.py |  8 ++++++--
 src/server/CMakeLists.txt    |  9 ++++++---
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4d6cb3..bedb9f1 100644
--- a/CMakeLists.txt
+++ b/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 "BSD")
     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 "BSD")
 
 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 "BSD")
 
 add_subdirectory(src)
 
diff --git a/COMPILE.txt b/COMPILE.txt
index 77428c9..b1b2322 100755
--- a/COMPILE.txt
+++ b/COMPILE.txt
@@ -300,3 +300,10 @@ Some things to be aware of:
 
       The relevant file is windows_runtime.zip.
 
+
+FreeBSD
+=======
+
+Compiling on FreeBSD should work by following the instructions for Linux
+as written above.
+
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index a4d7099..5625e3e 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -2,9 +2,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    add_definitions (-fsigned-char)
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
-include_directories(../thirdparty/v8/include)
-link_directories(../../../src/thirdparty/v8)
-link_directories(../../src/thirdparty/v8)
+include_directories(${CMAKE_SOURCE_DIR}/src/thirdparty/v8/include)
+link_directories(${CMAKE_SOURCE_DIR}/src/thirdparty/v8)
 
 #add_definitions(-DUSE_JPEG2000)
 
@@ -13,6 +12,10 @@ add_executable(Intensity_CClient ../engine/3dgui ../engine/blob ../engine/blend
 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(${WIN32})
-    target_link_libraries(opengl32 glu32 ws2_32 winmm msvcrt user32 imagehlp)
+    target_link_libraries(opengl32 glu32 ws2_32 winmm msvcrt user32 imagehlp) # Intensity_CClient?
 endif(${WIN32})
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
+    target_link_libraries(Intensity_CClient execinfo)
+endif(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
+
diff --git a/src/python/intensity/base.py b/src/python/intensity/base.py
index b7aabd1..405ca34 100755
--- a/src/python/intensity/base.py
+++ b/src/python/intensity/base.py
@@ -32,10 +32,14 @@
 ## Base module - foundational stuff
 
 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
+BSD = sys.platform.find("bsd") != -1
+
+UNIX = LINUX or OSX or BSD
 
-assert(WINDOWS or LINUX or OSX)
+assert(WINDOWS or UNIX)
 
 #
 # Version
@@ -102,7 +106,7 @@ def get_home_subdir():
 
     # Use default value if none given to us
     if HOME_SUBDIR is None:
-        if LINUX or OSX:
+        if UNIX:
             HOME_SUBDIR = os.path.join( os.path.expanduser('~'), '.intensityengine_'+suffix )
         elif WINDOWS:
             HOME_SUBDIR = os.path.join( os.path.expanduser('~'), 'intensityengine_'+suffix )
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 73d47cb..20ffe13 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -2,9 +2,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    add_definitions (-fsigned-char)
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
-include_directories(../thirdparty/v8/include)
-link_directories(../../../src/thirdparty/v8)
-link_directories(../../src/thirdparty/v8)
+include_directories(${CMAKE_SOURCE_DIR}/src/thirdparty/v8/include)
+link_directories(${CMAKE_SOURCE_DIR}/src/thirdparty/v8)
 
 #add_definitions(-DUSE_JPEG2000)
 
@@ -16,3 +15,7 @@ if(${WIN32})
     target_link_libraries(ws2_32 winmm msvcrt opengl32)
 endif(${WIN32})
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
+    target_link_libraries(Intensity_CServer execinfo)
+endif(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
+