[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21631] branches/blender2.5/blender: SCons
Nathan Letwory
jesterking at letwory.net
Thu Jul 16 21:41:28 CEST 2009
Revision: 21631
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21631
Author: jesterking
Date: 2009-07-16 21:41:28 +0200 (Thu, 16 Jul 2009)
Log Message:
-----------
SCons
* ensure all SConscripts are ready for win64-vc (where necessary).
* ensure we have proper _DEBUG flag for Python when we're doing a debug build.
* some cleaning up of linking etc.
* ensure /EHsc is there for game engine modules.
Modified Paths:
--------------
branches/blender2.5/blender/config/win32-vc-config.py
branches/blender2.5/blender/config/win64-vc-config.py
branches/blender2.5/blender/extern/bullet2/src/SConscript
branches/blender2.5/blender/extern/ffmpeg/SConscript
branches/blender2.5/blender/extern/libopenjpeg/SConscript
branches/blender2.5/blender/intern/elbeem/SConscript
branches/blender2.5/blender/source/blender/editors/space_node/SConscript
branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
branches/blender2.5/blender/source/blender/python/SConscript
branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
branches/blender2.5/blender/source/gameengine/Expressions/SConscript
branches/blender2.5/blender/source/gameengine/GameLogic/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/common/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Bullet/SConscript
branches/blender2.5/blender/source/gameengine/Physics/common/SConscript
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/blender2.5/blender/source/gameengine/Rasterizer/SConscript
branches/blender2.5/blender/source/gameengine/SceneGraph/SConscript
branches/blender2.5/blender/source/gameengine/VideoTexture/SConscript
branches/blender2.5/blender/tools/Blender.py
Modified: branches/blender2.5/blender/config/win32-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-vc-config.py 2009-07-16 19:07:54 UTC (rev 21630)
+++ branches/blender2.5/blender/config/win32-vc-config.py 2009-07-16 19:41:28 UTC (rev 21631)
@@ -149,7 +149,7 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT', '/wd4244', '/wd4305', '/wd4800']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
CXXFLAGS = ['/EHsc']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
@@ -165,7 +165,7 @@
LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"', '/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"', '/NODEFAULTLIB:"msvcurt.lib"', '/LARGEADDRESSAWARE']
# # Todo
# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
Modified: branches/blender2.5/blender/config/win64-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win64-vc-config.py 2009-07-16 19:07:54 UTC (rev 21630)
+++ branches/blender2.5/blender/config/win64-vc-config.py 2009-07-16 19:41:28 UTC (rev 21631)
@@ -152,7 +152,8 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT', '/wd4244', '/wd4305', '/wd4800']
+CFLAGS = []
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
CXXFLAGS = ['/EHsc']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
@@ -172,16 +173,13 @@
BF_DEBUG=False
BF_BSC=False
-CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
-CXXFLAGS = ['/EHsc']
if BF_DEBUG:
BF_NUMJOBS=1
else:
BF_NUMJOBS=6
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"', '/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"', '/NODEFAULTLIB:"msvcurt.lib"']
BF_BUILDDIR = '..\\build\\blender25-win64-vc'
BF_INSTALLDIR='..\\install\\blender25-win64-vc'
Modified: branches/blender2.5/blender/extern/bullet2/src/SConscript
===================================================================
--- branches/blender2.5/blender/extern/bullet2/src/SConscript 2009-07-16 19:07:54 UTC (rev 21630)
+++ branches/blender2.5/blender/extern/bullet2/src/SConscript 2009-07-16 19:41:28 UTC (rev 21631)
@@ -10,7 +10,7 @@
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
defs += ' WIN32 NDEBUG _WINDOWS _LIB'
#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
- cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3']
+ cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
elif env['OURPLATFORM']=='win32-mingw':
defs += ' NDEBUG'
cflags += ['-O2']
Modified: branches/blender2.5/blender/extern/ffmpeg/SConscript
===================================================================
--- branches/blender2.5/blender/extern/ffmpeg/SConscript 2009-07-16 19:07:54 UTC (rev 21630)
+++ branches/blender2.5/blender/extern/ffmpeg/SConscript 2009-07-16 19:41:28 UTC (rev 21631)
@@ -148,7 +148,7 @@
break
sources.append(s)
- if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc' , 'darwin'] :
+ if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc', 'win64-vc' , 'darwin'] :
defs = "HAVE_AV_CONFIG_H _ISOC9X_SOURCE"
else :
defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
Modified: branches/blender2.5/blender/extern/libopenjpeg/SConscript
===================================================================
--- branches/blender2.5/blender/extern/libopenjpeg/SConscript 2009-07-16 19:07:54 UTC (rev 21630)
+++ branches/blender2.5/blender/extern/libopenjpeg/SConscript 2009-07-16 19:41:28 UTC (rev 21631)
@@ -10,14 +10,14 @@
flags = []
defs = []
-if env['OURPLATFORM'] == 'win32-vc':
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
flags = []
defs.append('OPJ_STATIC')
else:
flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']
oj_env = env.Clone()
-if not env['OURPLATFORM'] == 'win32-vc':
+if not env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
oj_env.Replace(CCFLAGS = '')
oj_env.Replace(BF_DEBUG_FLAGS = '')
Modified: branches/blender2.5/blender/intern/elbeem/SConscript
===================================================================
--- branches/blender2.5/blender/intern/elbeem/SConscript 2009-07-16 19:07:54 UTC (rev 21630)
+++ branches/blender2.5/blender/intern/elbeem/SConscript 2009-07-16 19:41:28 UTC (rev 21631)
@@ -10,7 +10,7 @@
if env['WITH_BF_OPENMP']:
defs += ' PARALLEL'
-if env['OURPLATFORM']=='win32-vc':
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
defs += ' USE_MSVC6FIXES'
incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC']
incs += ' extern '
Modified: branches/blender2.5/blender/source/blender/editors/space_node/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/SConscript 2009-07-16 19:07:54 UTC (rev 21630)
+++ branches/blender2.5/blender/source/blender/editors/space_node/SConscript 2009-07-16 19:41:28 UTC (rev 21631)
@@ -8,7 +8,7 @@
incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include'
defs = []
cf = []
-if env['OURPLATFORM'] == 'win32-vc':
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
#cf.append('/WX')
pass
if env['CC'] == 'gcc':
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/SConscript 2009-07-16 19:07:54 UTC (rev 21630)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/SConscript 2009-07-16 19:41:28 UTC (rev 21631)
@@ -86,7 +86,7 @@
if env['BF_DEBUG']:
makesrna_tool.Append(CFLAGS = env['BF_DEBUG_CFLAGS'])
makesrna_tool.Append(CCFLAGS = env['BF_DEBUG_CCFLAGS'])
- if env['OURPLATFORM'] == 'win32-vc':
+ if env['OURPLATFORM'] in ('win32-vc','win64-vc'):
makesrna_tool.Append(LINKFLAGS = ['/DEBUG','/PDB:makesrna.pdb'])
targetpath = root_build_dir+'/makesrna'
Modified: branches/blender2.5/blender/source/blender/python/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/python/SConscript 2009-07-16 19:07:54 UTC (rev 21630)
+++ branches/blender2.5/blender/source/blender/python/SConscript 2009-07-16 19:41:28 UTC (rev 21631)
@@ -1,21 +1,21 @@
-#!/usr/bin/python
-Import ('env')
-
-sources = env.Glob('intern/*.c')
-
-incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes'
-incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager'
-incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include'
-incs += ' ' + env['BF_PYTHON_INC']
-
-defs = []
-
-if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc') and env['BF_DEBUG']:
- defs.append('Py_TRACE_REFS')
-
-env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [140])
-
-
-# generic
-sources = env.Glob('generic/*.c')
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('intern/*.c')
+
+incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes'
+incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager'
+incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include'
+incs += ' ' + env['BF_PYTHON_INC']
+
+defs = []
+
+if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']:
+ defs.append('_DEBUG')
+
+env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [140])
+
+
+# generic
+sources = env.Glob('generic/*.c')
env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) # ketsji is 360
Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript 2009-07-16 19:07:54 UTC (rev 21630)
+++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript 2009-07-16 19:41:28 UTC (rev 21631)
@@ -29,8 +29,9 @@
incs += ' ' + env['BF_OPENGL_INC']
cxxflags = []
-if env['OURPLATFORM']=='win32-vc':
+if env['OURPLATFORM'] in ('win32-vc','win64-vc'):
cxxflags.append ('/GR')
cxxflags.append ('/O2')
+ cxxflags.append ('/EHsc')
env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core', 'player'], priority=[300, 45] , cxx_compileflags=cxxflags)
Modified: branches/blender2.5/blender/source/gameengine/Expressions/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/Expressions/SConscript 2009-07-16 19:07:54 UTC (rev 21630)
+++ branches/blender2.5/blender/source/gameengine/Expressions/SConscript 2009-07-16 19:41:28 UTC (rev 21631)
@@ -7,8 +7,9 @@
incs += ' ' + env['BF_PYTHON_INC']
cxxflags = []
-if env['OURPLATFORM']=='win32-vc':
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list