binreloc wasnt working with cmake.
authorCampbell Barton <ideasman42@gmail.com>
Sun, 19 Jul 2009 19:36:56 +0000 (19:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 19 Jul 2009 19:36:56 +0000 (19:36 +0000)
blenderplayer/CMakeLists.txt
extern/binreloc/CMakeLists.txt
extern/binreloc/Makefile
source/creator/CMakeLists.txt

index 5b13a5f45212a770e1c6ea6e28ce8767f66f2689..2d8fc6ff4b9a3e4fca28276f4ac4c5bacf477fec 100644 (file)
@@ -32,10 +32,10 @@ IF(WITH_QUICKTIME)
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
-IF(LINUX)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   ADD_DEFINITIONS(-DWITH_BINRELOC)
   INCLUDE_DIRECTORIES(${BINRELOC_INC})
-endif(LINUX)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
index 78dc65d81124e887aae49247d78964e7ffe954bd..7bdc93fc978c9e3a27b9697dfd5362e8c0c86512 100644 (file)
@@ -18,8 +18,8 @@
 # All rights reserved.
 #
 
-SET(INC ./include ${WINTAB_INC})
-ADD_DEFINITIONS(-DWITH_BINRELOC)
+SET(INC ./include )
+ADD_DEFINITIONS(-DENABLE_BINRELOC)
 FILE(GLOB SRC *.c)
 
 BLENDERLIB(extern_binreloc "${SRC}" "${INC}")
index d303ab3afcc59d32051221ee38c465e32519449c..21343ab4803f567f13b22db05e73029389b4f913 100644 (file)
@@ -27,7 +27,7 @@ DIR = $(OCGDIR)/extern/$(LIBNAME)
 
 include nan_definitions.mk
 
-CPPFLAGS += -I./include
+CPPFLAGS += -DENABLE_BINRELOC -I./include
 
 
 include nan_compile.mk
index cd0d551211fa9f9552441d21577c70dec776c627..b337167853436a9919ee561e66609ae59f3a0286 100644 (file)
@@ -62,10 +62,10 @@ ELSE(WITH_PYTHON)
   ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
-IF(LINUX)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   ADD_DEFINITIONS(-DWITH_BINRELOC)
   INCLUDE_DIRECTORIES(${BINRELOC_INC})
-endif(LINUX)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 MESSAGE(STATUS "Configuring blender")