diff options
| author | Kent Mein <mein@cs.umn.edu> | 2008-01-19 00:39:47 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2008-01-19 00:39:47 +0300 |
| commit | 320ac3f0e289b2c4d8add38926913eb2d4809f55 (patch) | |
| tree | 07a0aa4716ba36761135b5cc45c635c1b7036aad /source/creator | |
| parent | 3df9587b40b109b97fd674cc03ab6d1801ae3e24 (diff) | |
Fixing makefiles for binreloc I made it use flags like other
things default on for linux. ideasman helped me get scons working.
Cmake still needs some love...
Kent
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/creator/Makefile | 8 | ||||
| -rw-r--r-- | source/creator/SConscript | 5 | ||||
| -rw-r--r-- | source/creator/creator.c | 5 |
4 files changed, 15 insertions, 8 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index a34ed069b02..7b9da71a501 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -42,12 +42,17 @@ 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) + ADD_DEFINITIONS(-DWITH_BINRELOC) +endif(WITH_VINRELOC) + IF(YESIAMSTUPID) ADD_DEFINITIONS(-DYESIAMSTUPID) ENDIF(YESIAMSTUPID) diff --git a/source/creator/Makefile b/source/creator/Makefile index 5fba2a1bb70..a7f2dfeecb6 100644 --- a/source/creator/Makefile +++ b/source/creator/Makefile @@ -42,9 +42,7 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I../blender/render/extern/include CPPFLAGS += -I../blender/radiosity/extern/include -ifeq ($(OS),linux) - CPPFLAGS += -I$(OCGDIR)/extern/binreloc/include -endif + # two needed for the kernel CPPFLAGS += -I../blender/imbuf CPPFLAGS += -I../blender/makesdna @@ -62,6 +60,10 @@ ifeq ($(WITH_QUICKTIME), true) CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME endif +ifeq ($(WITH_BINRELOC), true) + CPPFLAGS += -I$(OCGDIR)/extern/binreloc/include -DWITH_BINRELOC +endif + ifeq ($(NAN_YESIAMSTUPID), true) CPPFLAGS += -DYESIAMSTUPID endif diff --git a/source/creator/SConscript b/source/creator/SConscript index b09229a1641..833b56eccd8 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -15,7 +15,8 @@ if env['WITH_BF_QUICKTIME']==1: incs += ' ' + env['BF_QUICKTIME_INC'] defs.append('WITH_QUICKTIME') -if env['OURPLATFORM'] == 'linux2': - incs += ' ../../extern/binreloc/include' +if env['WITH_BF_BINRELOC']==1: + incs += ' ../../extern/binreloc/include' + defs.append('WITH_BINRELOC') env.BlenderLib ( libname = 'blender_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 1 ) diff --git a/source/creator/creator.c b/source/creator/creator.c index 7e426288340..11065155f12 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -97,7 +97,7 @@ # include <sys/rtprio.h> #endif -#ifdef __linux__ +#ifdef WITH_BINRELOC #include "binreloc.h" #endif @@ -258,8 +258,7 @@ int main(int argc, char **argv) #endif -#ifdef __linux__ - /* linux uses binrealoc to know its binary path */ +#ifdef WITH_BINRELOC br_init( NULL ); #endif |