[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35181] trunk/blender: fix for scons with recent change to how BINRELOC is enabled via cmake.

[Campbell Barton]

Revision: 35181
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35181
Author:   campbellbarton
Date:     2011-02-25 14:45:45 +0000 (Fri, 25 Feb 2011)
Log Message:
-----------
fix for scons with recent change to how BINRELOC is enabled via cmake.
also add WITH_PYTHON define to qtcreator project generator until we get a way to add them properly.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/cmake_qtcreator_project.py
    trunk/blender/extern/SConscript
    trunk/blender/source/blender/blenlib/SConscript
    trunk/blender/source/blenderplayer/CMakeLists.txt

Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py	2011-02-25 14:32:35 UTC (rev 35180)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py	2011-02-25 14:45:45 UTC (rev 35181)
@@ -94,6 +94,8 @@
 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

Modified: trunk/blender/extern/SConscript
===================================================================
--- trunk/blender/extern/SConscript	2011-02-25 14:32:35 UTC (rev 35180)
+++ trunk/blender/extern/SConscript	2011-02-25 14:45:45 UTC (rev 35181)
@@ -13,7 +13,7 @@
 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']:

Modified: trunk/blender/source/blender/blenlib/SConscript
===================================================================
--- trunk/blender/source/blender/blenlib/SConscript	2011-02-25 14:32:35 UTC (rev 35180)
+++ trunk/blender/source/blender/blenlib/SConscript	2011-02-25 14:45:45 UTC (rev 35181)
@@ -9,9 +9,10 @@
 incs += ' ' + env['BF_ZLIB_INC']
 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']

Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt	2011-02-25 14:32:35 UTC (rev 35180)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt	2011-02-25 14:45:45 UTC (rev 35181)
@@ -33,11 +33,6 @@
 	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/