diff options
| -rw-r--r-- | build_files/cmake/cmake_qtcreator_project.py | 2 | ||||
| -rw-r--r-- | extern/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/SConscript | 5 | ||||
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 5 |
4 files changed, 6 insertions, 8 deletions
diff --git a/build_files/cmake/cmake_qtcreator_project.py b/build_files/cmake/cmake_qtcreator_project.py index ca214338298..925aee564b8 100644 --- a/build_files/cmake/cmake_qtcreator_project.py +++ b/build_files/cmake/cmake_qtcreator_project.py @@ -94,6 +94,8 @@ qtc_cfg = join(base, "%s.config" % PROJECT_NAME) if not exists(qtc_cfg): f = open(qtc_cfg, 'w') f.write("// ADD PREDEFINED MACROS HERE!\n") + # todo, include real defines. + f.write("#define WITH_PYTHON\n") print("Project file written to: %s" % qtc_prj) # --- end diff --git a/extern/SConscript b/extern/SConscript index 22c7dc23dce..bd73d71f123 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -13,7 +13,7 @@ if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '': if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '': SConscript(['libredcode/SConscript']) -if env['OURPLATFORM'] == 'linux2': +if env['WITH_BF_BINRELOC']: SConscript(['binreloc/SConscript']); if env['WITH_BF_LZO']: diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 57c4865dafd..00caf8cd01d 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -7,11 +7,12 @@ cflags='' incs = '. ../makesdna ../blenkernel #/intern/guardedalloc #/intern/ghost ../editors/include ../gpu ../blenloader' incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_ZLIB_INC'] -defs = '' +defs = [] -if env['OURPLATFORM'] == 'linux2': +if env['WITH_BF_BINRELOC']: cflags='-pthread' incs += ' ../../../extern/binreloc/include' + defs.append('WITH_BINRELOC') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 8f1730eb8fb..760ee168294 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -33,11 +33,6 @@ if(WITH_CODEC_QUICKTIME) add_definitions(-DWITH_QUICKTIME) endif() -if(WITH_BINRELOC) - add_definitions(-DWITH_BINRELOC) - blender_include_dirs(${BINRELOC_INC}) -endif() - add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/ |