[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46487] tags/blender-2.63a-release/blender : Merge 46051-46053 to ensure compilation on Windows

Nathan Letwory nathan at letworyinteractive.com
Thu May 10 11:05:04 CEST 2012


Revision: 46487
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46487
Author:   jesterking
Date:     2012-05-10 09:05:03 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Merge 46051-46053 to ensure compilation on Windows

Modified Paths:
--------------
    tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
    tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/SConscript
    tags/blender-2.63a-release/blender/source/gameengine/Converter/CMakeLists.txt
    tags/blender-2.63a-release/blender/source/gameengine/Converter/SConscript
    tags/blender-2.63a-release/blender/source/gameengine/Ketsji/CMakeLists.txt
    tags/blender-2.63a-release/blender/source/gameengine/Ketsji/SConscript

Property Changed:
----------------
    tags/blender-2.63a-release/blender/


Property changes on: tags/blender-2.63a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:46003-46005,46014-46016,46027-46028,46035-46036,46039,46043,46072,46077,46085,46091,46093,46095,46116-46117,46120,46125,46127,46131,46136,46138,46140-46143,46148-46149,46152,46156-46160,46172,46178-46181,46183-46184,46192,46194,46196-46197,46205-46206,46213-46215,46222,46224-46236,46241,46246,46250,46253,46260-46261,46264-46265,46269,46273,46277-46278,46280,46282,46289-46290,46294,46305,46308,46310-46311,46316,46327,46336,46338,46341-46342,46345-46347,46354,46361-46363,46385,46391,46393,46410-46412,46416-46417,46423-46424,46439,46445,46449-46450,46453-46454
   + /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:46003-46005,46014-46016,46027-46028,46035-46036,46039,46043,46051-46053,46072,46077,46085,46091,46093,46095,46116-46117,46120,46125,46127,46131,46136,46138,46140-46143,46148-46149,46152,46156-46160,46172,46178-46181,46183-46184,46192,46194,46196-46197,46205-46206,46213-46215,46222,46224-46236,46241,46246,46250,46253,46260-46261,46264-46265,46269,46273,46277-46278,46280,46282,46289-46290,46294,46305,46308,46310-46311,46316,46327,46336,46338,46341-46342,46345-46347,46354,46361-46363,46385,46391,46393,46410-46412,46416-46417,46423-46424,46439,46445,46449-46450,46453-46454

Modified: tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
===================================================================
--- tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/CMakeLists.txt	2012-05-10 07:10:39 UTC (rev 46486)
+++ tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/CMakeLists.txt	2012-05-10 09:05:03 UTC (rev 46487)
@@ -32,7 +32,7 @@
 )
 
 set(INC_SYS
-
+	${PTHREADS_INCLUDE_DIRS}
 )
 
 set(SRC

Modified: tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/SConscript
===================================================================
--- tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/SConscript	2012-05-10 07:10:39 UTC (rev 46486)
+++ tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/SConscript	2012-05-10 09:05:03 UTC (rev 46487)
@@ -35,4 +35,7 @@
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
+    incs += ' ' + env['BF_PTHREADS_INC']
+
 env.BlenderLib ( 'ge_blen_routines', sources, Split(incs), defs, libtype=['core','player'], priority=[300,35] , cxx_compileflags=env['BGE_CXXFLAGS'])

Modified: tags/blender-2.63a-release/blender/source/gameengine/Converter/CMakeLists.txt
===================================================================
--- tags/blender-2.63a-release/blender/source/gameengine/Converter/CMakeLists.txt	2012-05-10 07:10:39 UTC (rev 46486)
+++ tags/blender-2.63a-release/blender/source/gameengine/Converter/CMakeLists.txt	2012-05-10 09:05:03 UTC (rev 46487)
@@ -59,6 +59,7 @@
 )
 
 set(INC_SYS
+	${PTHREADS_INCLUDE_DIRS}
 
 )
 

Modified: tags/blender-2.63a-release/blender/source/gameengine/Converter/SConscript
===================================================================
--- tags/blender-2.63a-release/blender/source/gameengine/Converter/SConscript	2012-05-10 07:10:39 UTC (rev 46486)
+++ tags/blender-2.63a-release/blender/source/gameengine/Converter/SConscript	2012-05-10 09:05:03 UTC (rev 46487)
@@ -39,4 +39,7 @@
 if env['WITH_BF_BULLET']:
     defs.append('USE_BULLET')
 
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
+    incs += ' ' + env['BF_PTHREADS_INC']
+
 env.BlenderLib ( 'ge_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])

Modified: tags/blender-2.63a-release/blender/source/gameengine/Ketsji/CMakeLists.txt
===================================================================
--- tags/blender-2.63a-release/blender/source/gameengine/Ketsji/CMakeLists.txt	2012-05-10 07:10:39 UTC (rev 46486)
+++ tags/blender-2.63a-release/blender/source/gameengine/Ketsji/CMakeLists.txt	2012-05-10 09:05:03 UTC (rev 46487)
@@ -55,6 +55,7 @@
 )
 
 set(INC_SYS
+	${PTHREADS_INCLUDE_DIRS}
 	${GLEW_INCLUDE_PATH}
 	../../../extern/recastnavigation/Recast/Include
 	../../../extern/recastnavigation/Detour/Include

Modified: tags/blender-2.63a-release/blender/source/gameengine/Ketsji/SConscript
===================================================================
--- tags/blender-2.63a-release/blender/source/gameengine/Ketsji/SConscript	2012-05-10 07:10:39 UTC (rev 46486)
+++ tags/blender-2.63a-release/blender/source/gameengine/Ketsji/SConscript	2012-05-10 09:05:03 UTC (rev 46487)
@@ -47,4 +47,7 @@
     defs.append('USE_BULLET')
     incs += ' #source/gameengine/Physics/Bullet'
 
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
+    incs += ' ' + env['BF_PTHREADS_INC']
+
 env.BlenderLib ( 'ge_logic_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320,45], cxx_compileflags=env['BGE_CXXFLAGS'])




More information about the Bf-blender-cvs mailing list