[Bf-committers] Fwd: Updates for VC project files, lib/windows
Jacques Beaurain
jbeaurain at istop.com
Sun Jan 9 18:13:52 CET 2005
Skipped content of type multipart/alternative-------------- next part --------------
Index: source/blender/render/SConscript
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/render/SConscript,v
retrieving revision 1.7
diff -u -r1.7 SConscript
--- source/blender/render/SConscript 27 Dec 2004 19:28:49 -0000 1.7
+++ source/blender/render/SConscript 9 Jan 2005 15:51:16 -0000
@@ -1,4 +1,5 @@
#!/usr/bin/python
+import sys
Import ('user_options_dict')
Import ('library_env')
Import ('sdl_env')
@@ -27,18 +28,33 @@
'intern/source/zbufferdatastruct.c']
-render_env.Append (CPPPATH = ['intern/include',
- '#/intern/guardedalloc',
- '../blenlib',
- '../makesdna',
- 'extern/include',
- '../blenkernel',
- '../radiosity/extern/include',
- '../imbuf',
- '../quicktime',
- '../include',
- '../../kernel/gen_messaging',
- '../yafray'] +
- sdl_env['CPPPATH'])
+if sys.platform == 'win32':
+ render_env.Append (CPPPATH = ['intern/include',
+ '#/intern/guardedalloc',
+ '../blenlib',
+ '../makesdna',
+ 'extern/include',
+ '../blenkernel',
+ '../radiosity/extern/include',
+ '../imbuf',
+ '../quicktime',
+ '../include',
+ '../../kernel/gen_messaging',
+ '../yafray',
+ '#../lib/windows/sdl/include'])
+else:
+ render_env.Append (CPPPATH = ['intern/include',
+ '#/intern/guardedalloc',
+ '../blenlib',
+ '../makesdna',
+ 'extern/include',
+ '../blenkernel',
+ '../radiosity/extern/include',
+ '../imbuf',
+ '../quicktime',
+ '../include',
+ '../../kernel/gen_messaging',
+ '../yafray'] +
+ sdl_env['CPPPATH'])
render_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_render', source=source_files)
-------------- next part --------------
Index: SConstruct
===================================================================
RCS file: /cvsroot/bf-blender/blender/SConstruct,v
retrieving revision 1.96
diff -u -r1.96 SConstruct
--- SConstruct 2 Jan 2005 16:35:48 -0000 1.96
+++ SConstruct 9 Jan 2005 16:19:39 -0000
@@ -332,23 +332,24 @@
build_blender_static = 'false'
build_blender_player = 'true'
build_blender_plugin = 'false'
- release_flags = ['/Og', '/Ot', '/Ob1', '/Op', '/G6']
- debug_flags = ['/Zi', '/Fr${TARGET.base}.sbr']
- extra_flags = ['/EHsc', '/J', '/W3', '/Gd', '/MT']
+ release_flags = ['/O2', '/Ob2', '/Ot', '/Oy', '/MT', '/Zi']
+ debug_flags = ['/ZI', '/Gy', '/Od', '/RTC1', '/MTd', '/FR']
+ extra_flags = ['/EHsc', '/J', '/W3', '/Gd', '/GS']
cxxflags = []
defines = ['WIN32', '_CONSOLE']
defines += ['WITH_QUICKTIME']
defines += ['_LIB', 'USE_OPENAL']
defines += ['FTGL_LIBRARY_STATIC']
warn_flags = []
- platform_libs = [ 'qtmlClient', 'soundsystem',
- 'ws2_32', 'dxguid', 'vfw32', 'winmm',
- 'iconv', 'kernel32', 'user32', 'gdi32',
- 'winspool', 'comdlg32', 'advapi32', 'shell32',
- 'ole32', 'oleaut32', 'uuid', 'odbc32', 'odbccp32',
- 'libcmt', 'libc']
+ platform_libs = [ 'qtmlClient', 'soundsystem',
+ 'ws2_32', 'dxguid', 'vfw32', 'winmm',
+ 'iconv', 'kernel32', 'user32', 'gdi32',
+ 'winspool', 'comdlg32', 'advapi32', 'shell32',
+ 'ole32', 'oleaut32', 'uuid', 'odbc32', 'odbccp32']
platform_libpath = ['#../lib/windows/iconv/lib',
'#../lib/windows/QTDevWin/Libraries']
+ # The /DEBUG linker option just causes a program database to be created and does not affect the executable.
+ # This is useful to do release mode debugging on windows with almost full call stack and limited variable inspection.
platform_linkflags = [
'/SUBSYSTEM:CONSOLE',
'/MACHINE:IX86',
@@ -356,11 +357,9 @@
'/INCREMENTAL:NO',
'/NODEFAULTLIB:"msvcprt.lib"',
'/NODEFAULTLIB:"glut32.lib"',
+ '/NODEFAULTLIB:"libc.lib"',
'/NODEFAULTLIB:"libcd.lib"',
- #'/NODEFAULTLIB:"libc.lib"',
- '/NODEFAULTLIB:"libcpd.lib"',
- '/NODEFAULTLIB:"libcp.lib"',
- '/NODEFAULTLIB:"libcmtd.lib"',
+ '/DEBUG'
]
window_system = 'WIN32'
extra_includes = []
@@ -985,7 +984,8 @@
else:
cflags = extra_flags + debug_flags + warn_flags
if sys.platform == 'win32':
- platform_linkflags = ['/DEBUG','/PDB:blender.pdb'] + platform_linkflags
+ defines += ['_DEBUG']
+
defines += user_options_dict['DEFINES']
cflags += user_options_dict['CCFLAGS']
Index: extern/qhull/Qhull-go.pif
===================================================================
RCS file: /cvsroot/bf-blender/blender/extern/qhull/Qhull-go.pif,v
retrieving revision 1.1
diff -u -r1.1 Qhull-go.pif
Binary files /tmp/cvskEebpu and Qhull-go.pif differ
Index: extern/qhull/SConscript
===================================================================
RCS file: /cvsroot/bf-blender/blender/extern/qhull/SConscript,v
retrieving revision 1.7
diff -u -r1.7 SConscript
--- extern/qhull/SConscript 14 Nov 2004 14:38:03 -0000 1.7
+++ extern/qhull/SConscript 9 Jan 2005 16:17:36 -0000
@@ -9,8 +9,6 @@
Import ('user_options_dict')
if sys.platform=='linux2' or sys.platform=='linux-i386':
qhull_env.Append (CCFLAGS = ['-O2', '-ansi'])
-elif sys.platform=='win32':
- qhull_env.Append (CCFLAGS = ['/O2'])
elif sys.platform=='sunos':
qhull_env.Append (CCFLAGS = ['Xc', '-v', '-fast'])
elif sys.platform=='darwin':
Index: extern/solid/SConscript
===================================================================
RCS file: /cvsroot/bf-blender/blender/extern/solid/SConscript,v
retrieving revision 1.8
diff -u -r1.8 SConscript
--- extern/solid/SConscript 14 Nov 2004 14:38:03 -0000 1.8
+++ extern/solid/SConscript 9 Jan 2005 16:22:43 -0000
@@ -5,7 +5,8 @@
# Import the C flags set in the SConstruct file
Import ('cflags')
#Import ('cxxflags')
-#Import ('defines')
+if sys.platform=='win32':
+ Import ('defines')
Import ('user_options_dict')
#defines = ['QHULL', '_LIB']
defines = ['USE_DOUBLES','QHULL', '_LIB']
@@ -13,9 +14,9 @@
cxxflags = []
if sys.platform=='win32':
- defines += ['WIN32','NDEBUG', '_WINDOWS', '_LIB']
- #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
- cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
+ print "################################################"
+ print
+ print "Solid: MSVC Flags were inherited from SConstruct"
elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5':
defines += ['NDEBUG']
cflags += ['-O2']
Index: source/gameengine/GameLogic/SCA_IInputDevice.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/gameengine/GameLogic/SCA_IInputDevice.cpp,v
retrieving revision 1.6
diff -u -r1.6 SCA_IInputDevice.cpp
--- source/gameengine/GameLogic/SCA_IInputDevice.cpp 16 Oct 2004 18:13:00 -0000 1.6
+++ source/gameengine/GameLogic/SCA_IInputDevice.cpp 9 Jan 2005 15:29:31 -0000
@@ -29,7 +29,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#include <iostream.h>
#include <assert.h>
#include "SCA_IInputDevice.h"
Index: source/gameengine/GameLogic/SCA_KeyboardManager.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/gameengine/GameLogic/SCA_KeyboardManager.cpp,v
retrieving revision 1.5
diff -u -r1.5 SCA_KeyboardManager.cpp
--- source/gameengine/GameLogic/SCA_KeyboardManager.cpp 16 Oct 2004 11:41:48 -0000 1.5
+++ source/gameengine/GameLogic/SCA_KeyboardManager.cpp 9 Jan 2005 15:29:31 -0000
@@ -32,7 +32,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#include <iostream.h>
#include "BoolValue.h"
#include "SCA_KeyboardManager.h"
#include "SCA_KeyboardSensor.h"
Index: source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp,v
retrieving revision 1.6
diff -u -r1.6 GPC_KeyboardDevice.cpp
--- source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp 10 Nov 2004 15:04:13 -0000 1.6
+++ source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp 9 Jan 2005 15:29:31 -0000
@@ -30,7 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#include <iostream.h>
#include "GPC_KeyboardDevice.h"
#ifdef HAVE_CONFIG_H
Index: source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp,v
retrieving revision 1.4
diff -u -r1.4 GPU_KeyboardDevice.cpp
--- source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp 22 Mar 2004 22:01:42 -0000 1.4
+++ source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp 9 Jan 2005 15:29:31 -0000
@@ -29,7 +29,6 @@
*
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#include <iostream.h>
#include "GPU_KeyboardDevice.h"
#ifdef HAVE_CONFIG_H
Index: source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp,v
retrieving revision 1.5
diff -u -r1.5 KXH_ketsji_hooks.cpp
--- source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp 21 May 2004 09:18:42 -0000 1.5
+++ source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp 9 Jan 2005 15:29:25 -0000
@@ -36,7 +36,6 @@
* Application handle refers to ketsji_engine_data!!!
*/
-#include <iostream.h>
#include <stdio.h>
/* Moz infra: */
Index: source/gameengine/Ketsji/SConscript
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/gameengine/Ketsji/SConscript,v
retrieving revision 1.8
diff -u -r1.8 SConscript
--- source/gameengine/Ketsji/SConscript 16 May 2004 13:07:15 -0000 1.8
+++ source/gameengine/Ketsji/SConscript 9 Jan 2005 16:28:34 -0000
@@ -1,10 +1,14 @@
#!/usr/bin/python
import sys
+ketsji_env = Environment()
+
Import ('user_options_dict')
-Import ('library_env')
-ketsji_env = library_env.Copy ()
+Import ('cflags')
+Import ('defines')
+ketsji_env.Append (CCFLAGS = cflags)
+ketsji_env.Append (CPPDEFINES = defines)
source_files = ['KX_WorldIpoController.cpp',
'KX_WorldInfo.cpp',
@@ -104,9 +108,6 @@
'#source/blender/blenloader'
])
-if sys.platform == 'win32':
- ketsji_env.Append (CXXFLAGS = ['/GR'])
- ketsji_env.Append ( CCFLAGS =['/Ox'])
ketsji_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
ketsji_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_ketsji', source=source_files)
Index: source/gameengine/Physics/Sumo/SConscript
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/gameengine/Physics/Sumo/SConscript,v
retrieving revision 1.7
diff -u -r1.7 SConscript
--- source/gameengine/Physics/Sumo/SConscript 22 Nov 2004 10:19:19 -0000 1.7
+++ source/gameengine/Physics/Sumo/SConscript 9 Jan 2005 16:48:25 -0000
@@ -1,9 +1,14 @@
#!/usr/bin/python
import sys
+
+phy_sumo_env = Environment()
+
Import ('user_options_dict')
-Import ('library_env')
-phy_sumo_env = library_env.Copy ()
+Import ('cflags')
+Import ('defines')
+phy_sumo_env.Append (CCFLAGS = cflags)
+phy_sumo_env.Append (CPPDEFINES = defines)
source_files = ['SumoPhysicsController.cpp',
'SumoPhysicsEnvironment.cpp',
@@ -20,9 +25,5 @@
])
phy_sumo_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
-
-if sys.platform=='win32':
- phy_sumo_env.Append (CXXFLAGS = ['/GR'])
- phy_sumo_env.Append ( CCFLAGS =['/O1'])
phy_sumo_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files)
Index: source/gameengine/Rasterizer/SConscript
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/gameengine/Rasterizer/SConscript,v
retrieving revision 1.6
diff -u -r1.6 SConscript
--- source/gameengine/Rasterizer/SConscript 16 May 2004 13:07:16 -0000 1.6
+++ source/gameengine/Rasterizer/SConscript 9 Jan 2005 16:28:32 -0000
@@ -1,9 +1,14 @@
#!/usr/bin/python
import sys
+
+ras_rasterizer_env = Environment()
+
Import ('user_options_dict')
-Import ('library_env')
-ras_rasterizer_env = library_env.Copy ()
+Import ('cflags')
+Import ('defines')
+ras_rasterizer_env.Append (CCFLAGS = cflags)
+ras_rasterizer_env.Append (CPPDEFINES = defines)
source_files = ['RAS_BucketManager.cpp',
'RAS_FramingManager.cpp',
@@ -20,8 +25,5 @@
'#intern/string',
'#intern/moto/include'
])
-
-if sys.platform=='win32':
- ras_rasterizer_env.Append ( CCFLAGS =['/Ox'])
ras_rasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_rasterizer', source=source_files)
More information about the Bf-committers
mailing list