forked from bartvdbraak/blender
binreloc wasnt working with cmake.
This commit is contained in:
parent
62ffb81316
commit
4e9171e6f6
@ -32,10 +32,10 @@ IF(WITH_QUICKTIME)
|
|||||||
ADD_DEFINITIONS(-DWITH_QUICKTIME)
|
ADD_DEFINITIONS(-DWITH_QUICKTIME)
|
||||||
ENDIF(WITH_QUICKTIME)
|
ENDIF(WITH_QUICKTIME)
|
||||||
|
|
||||||
IF(LINUX)
|
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||||
ADD_DEFINITIONS(-DWITH_BINRELOC)
|
ADD_DEFINITIONS(-DWITH_BINRELOC)
|
||||||
INCLUDE_DIRECTORIES(${BINRELOC_INC})
|
INCLUDE_DIRECTORIES(${BINRELOC_INC})
|
||||||
endif(LINUX)
|
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||||
|
|
||||||
ADD_CUSTOM_COMMAND(
|
ADD_CUSTOM_COMMAND(
|
||||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
|
||||||
|
4
extern/binreloc/CMakeLists.txt
vendored
4
extern/binreloc/CMakeLists.txt
vendored
@ -18,8 +18,8 @@
|
|||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
|
|
||||||
SET(INC ./include ${WINTAB_INC})
|
SET(INC ./include )
|
||||||
ADD_DEFINITIONS(-DWITH_BINRELOC)
|
ADD_DEFINITIONS(-DENABLE_BINRELOC)
|
||||||
FILE(GLOB SRC *.c)
|
FILE(GLOB SRC *.c)
|
||||||
|
|
||||||
BLENDERLIB(extern_binreloc "${SRC}" "${INC}")
|
BLENDERLIB(extern_binreloc "${SRC}" "${INC}")
|
||||||
|
2
extern/binreloc/Makefile
vendored
2
extern/binreloc/Makefile
vendored
@ -27,7 +27,7 @@ DIR = $(OCGDIR)/extern/$(LIBNAME)
|
|||||||
|
|
||||||
include nan_definitions.mk
|
include nan_definitions.mk
|
||||||
|
|
||||||
CPPFLAGS += -I./include
|
CPPFLAGS += -DENABLE_BINRELOC -I./include
|
||||||
|
|
||||||
|
|
||||||
include nan_compile.mk
|
include nan_compile.mk
|
||||||
|
@ -62,10 +62,10 @@ ELSE(WITH_PYTHON)
|
|||||||
ADD_DEFINITIONS(-DDISABLE_PYTHON)
|
ADD_DEFINITIONS(-DDISABLE_PYTHON)
|
||||||
ENDIF(WITH_PYTHON)
|
ENDIF(WITH_PYTHON)
|
||||||
|
|
||||||
IF(LINUX)
|
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||||
ADD_DEFINITIONS(-DWITH_BINRELOC)
|
ADD_DEFINITIONS(-DWITH_BINRELOC)
|
||||||
INCLUDE_DIRECTORIES(${BINRELOC_INC})
|
INCLUDE_DIRECTORIES(${BINRELOC_INC})
|
||||||
endif(LINUX)
|
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||||
|
|
||||||
MESSAGE(STATUS "Configuring blender")
|
MESSAGE(STATUS "Configuring blender")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user