diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-07-19 23:36:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-19 23:36:56 +0400 |
| commit | 4e9171e6f6f3b09d2faa50f790d2abff51082ea7 (patch) | |
| tree | 6b9442c25ff2ae7cec7439387962814a9f3c1477 | |
| parent | 62ffb81316bbae1c1bf286d72e729f623004a0b8 (diff) | |
binreloc wasnt working with cmake.
| -rw-r--r-- | blenderplayer/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | extern/binreloc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | extern/binreloc/Makefile | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/blenderplayer/CMakeLists.txt b/blenderplayer/CMakeLists.txt index 5b13a5f4521..2d8fc6ff4b9 100644 --- a/blenderplayer/CMakeLists.txt +++ b/blenderplayer/CMakeLists.txt @@ -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 diff --git a/extern/binreloc/CMakeLists.txt b/extern/binreloc/CMakeLists.txt index 78dc65d8112..7bdc93fc978 100644 --- a/extern/binreloc/CMakeLists.txt +++ b/extern/binreloc/CMakeLists.txt @@ -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}") diff --git a/extern/binreloc/Makefile b/extern/binreloc/Makefile index d303ab3afcc..21343ab4803 100644 --- a/extern/binreloc/Makefile +++ b/extern/binreloc/Makefile @@ -27,7 +27,7 @@ DIR = $(OCGDIR)/extern/$(LIBNAME) include nan_definitions.mk -CPPFLAGS += -I./include +CPPFLAGS += -DENABLE_BINRELOC -I./include include nan_compile.mk diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index cd0d551211f..b3371678534 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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") |