Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Want <cwant@ualberta.ca>2008-01-22 08:34:53 +0300
committerChris Want <cwant@ualberta.ca>2008-01-22 08:34:53 +0300
commit659316e4f491b62868a6706fb35d097f51711c67 (patch)
tree1352f60da0cbe13dbaffe6a2e22674471d3466b5 /source/creator/CMakeLists.txt
parentc4929f84f77747957389a72092b5afd8383aa3eb (diff)
Fixes for CMake.
Diffstat (limited to 'source/creator/CMakeLists.txt')
-rw-r--r--source/creator/CMakeLists.txt13
1 files changed, 10 insertions, 3 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 4f11ea672d3..2b566d77a29 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -42,16 +42,18 @@ INCLUDE_DIRECTORIES(../../intern/guardedalloc
../blender/makesdna
../kernel/gen_messaging
../kernel/gen_system
- ../../extern/binreloc/include
)
+
+
IF(WITH_QUICKTIME)
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
-IF(WITH_BINRELOC)
+IF(LINUX)
ADD_DEFINITIONS(-DWITH_BINRELOC)
-endif(WITH_BINRELOC)
+ INCLUDE_DIRECTORIES(${BINRELOC_INC})
+endif(LINUX)
IF(YESIAMSTUPID)
ADD_DEFINITIONS(-DYESIAMSTUPID)
@@ -196,6 +198,10 @@ FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity blender_IK bf_elbeem)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
IF(UNIX)
# Sort libraries
SET(BLENDER_SORTED_LIBS
@@ -259,6 +265,7 @@ IF(UNIX)
bf_moto
blender_python
bf_quicktime
+ extern_binreloc
)
FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})