Page MenuHome

blenddiff.txt

Authored By
Ad Killa (adkiller)
Nov 13 2013, 1:08 PM
Size
20 KB
Subscribers
None

blenddiff.txt

--- blender\extern\bFTGL\SConscript Fri May 06 21:37:18 2005
+++ blender-2.4.1\extern\bFTGL\SConscript Mon Feb 06 19:36:40 2006
@@ -8,11 +8,12 @@
Import ('cflags')
Import ('defines')
Import ('user_options_dict')
+cflags = []
if sys.platform=='linux2' or sys.platform=='linux-i386':
ftgl_env.Append (CCFLAGS = ['-O2', '-ansi'])
elif sys.platform=='win32':
- ftgl_env.Append (CCFLAGS = ['/O2'])
+ ftgl_env.Append (CCFLAGS = ['/MD', '/O2', '/Ob2', '/Oi', '/Os', '/Oy', '/GT', '/GL', '/GF', '/GS-', '/GA', '/fp:fast', '/EHsc', '/J', '/W3', '/Gd', '/Gy'])
elif sys.platform=='sunos':
ftgl_env.Append (CCFLAGS = ['Xc', '-v', '-fast'])
elif sys.platform=='darwin':
--- blender\extern\bullet\SConscript Sat Dec 31 15:20:07 2005
+++ blender-2.4.1\extern\bullet\SConscript Mon Feb 06 19:36:41 2006
@@ -10,14 +10,13 @@
#Import ('defines')
Import ('user_options_dict')
#defines = ['QHULL', '_LIB']
-defines = ['USE_DOUBLES','QHULL', '_LIB']
-#cflags = []
+defines = ['USE_DOUBLES','QHULL',]
+cflags = []
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']
+ defines += ['WIN32', '_WIN64', 'NDEBUG', '_WINDOWS', '_LIB']
+ cflags += ['/MD', '/O2', '/Ob2', '/Oi', '/Os', '/Oy', '/GT', '/GL', '/GF', '/GS-', '/GA', '/fp:fast', '/EHsc', '/J', '/W3', '/Gd', '/Gy']
elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5':
defines += ['NDEBUG']
cflags += ['-O2']
--- blender\extern\qhull\SConscript Fri May 06 21:37:17 2005
+++ blender-2.4.1\extern\qhull\SConscript Mon Feb 06 19:36:42 2006
@@ -8,10 +8,12 @@
Import ('cflags')
Import ('defines')
Import ('user_options_dict')
+cflags = []
+
if sys.platform=='linux2' or sys.platform=='linux-i386':
qhull_env.Append (CCFLAGS = ['-O2', '-ansi'])
elif sys.platform=='win32':
- qhull_env.Append (CCFLAGS = ['/O2'])
+ qhull_env.Append (CCFLAGS = ['/MD', '/O2', '/Ob2', '/Oi', '/Os', '/Oy', '/GT', '/GL', '/GF', '/GS-', '/GA', '/fp:fast', '/EHsc', '/J', '/W3', '/Gd', '/Gy'])
elif sys.platform=='sunos':
qhull_env.Append (CCFLAGS = ['Xc', '-v', '-fast'])
elif sys.platform=='darwin':
--- blender\extern\solid\SConscript Fri May 06 21:37:18 2005
+++ blender-2.4.1\extern\solid\SConscript Mon Feb 06 19:36:44 2006
@@ -10,14 +10,13 @@
#Import ('defines')
Import ('user_options_dict')
#defines = ['QHULL', '_LIB']
-defines = ['USE_DOUBLES','QHULL', '_LIB']
-#cflags = []
+defines = ['USE_DOUBLES','QHULL']
+cflags = []
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']
+ cflags += ['/MD', '/O2', '/Ob2', '/Oi', '/Os', '/Oy', '/GT', '/GL', '/GF', '/GS-', '/GA', '/fp:fast', '/EHsc', '/J', '/W3', '/Gd', '/Gy']
elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5':
defines += ['NDEBUG']
cflags += ['-O2']
--- blender\intern\container\CTR_TaggedIndex.h Fri Dec 27 02:25:08 2002
+++ blender-2.4.1\intern\container\CTR_TaggedIndex.h Thu Feb 02 01:42:50 2006
@@ -74,12 +74,24 @@
}
CTR_TaggedIndex(
+ const long long val
+ ) :
+ m_val ((val & index_mask) | ((empty_tag << tag_shift) & (~index_mask))) {
+ }
+
+ CTR_TaggedIndex(
const unsigned int val
) :
m_val ((val & index_mask) | ((empty_tag << tag_shift) & (~index_mask))) {
}
CTR_TaggedIndex(
+ const unsigned long long val
+ ) :
+ m_val ((val & index_mask) | ((empty_tag << tag_shift) & (~index_mask))) {
+ }
+
+ CTR_TaggedIndex(
const long int val
) :
m_val ( ((long int) val & index_mask)
@@ -114,7 +126,11 @@
operator unsigned int () const {
return m_val & index_mask;
}
-
+
+ operator unsigned long long () const {
+ return (unsigned long long)(m_val & index_mask);
+ }
+
operator unsigned long int () const {
return (unsigned long int)(m_val & index_mask);
}
@@ -123,6 +139,10 @@
return int(m_val & index_mask);
}
+ operator long long () const {
+ return (long long)(m_val & index_mask);
+ }
+
operator long int () const {
return (long int)(m_val & index_mask);
}
@@ -192,7 +212,7 @@
const CTR_TaggedIndex *index
) {};
- unsigned int m_val;
+ unsigned long long m_val;
};
--- blender\intern\ghost\intern\GHOST_SystemWin32.cpp Mon Nov 08 00:30:19 2004
+++ blender-2.4.1\intern\ghost\intern\GHOST_SystemWin32.cpp Wed Feb 01 05:18:55 2006
@@ -522,7 +522,7 @@
GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized")
if (hwnd) {
- GHOST_WindowWin32* window = (GHOST_WindowWin32*)::GetWindowLong(hwnd, GWL_USERDATA);
+ GHOST_WindowWin32* window = (GHOST_WindowWin32*)::GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (window) {
switch (msg) {
////////////////////////////////////////////////////////////////////////
--- blender\intern\ghost\intern\GHOST_WindowWin32.cpp Mon Jul 18 04:40:07 2005
+++ blender-2.4.1\intern\ghost\intern\GHOST_WindowWin32.cpp Wed Feb 01 05:20:57 2006
@@ -135,7 +135,7 @@
}
if (m_hWnd) {
// Store a pointer to this class in the window structure
- LONG result = ::SetWindowLong(m_hWnd, GWL_USERDATA, (LONG)this);
+ LONG_PTR result = ::SetWindowLongPtr(m_hWnd, GWLP_USERDATA, (LONG_PTR)this);
// Store the device context
m_hDC = ::GetDC(m_hWnd);
--- blender\intern\SoundSystem\openal\SND_OpenALDevice.cpp Sat Jan 07 08:14:36 2006
+++ blender-2.4.1\intern\SoundSystem\openal\SND_OpenALDevice.cpp Wed Feb 01 05:34:31 2006
@@ -281,9 +281,9 @@
{
#ifdef OUDE_OPENAL
ALenum alc_error = ALC_NO_ERROR; // openal_2.12
-#elif defined(_WIN32)
+//#elif defined(_WIN32)
// alcGetError has no arguments on windows
- ALenum alc_error = alcGetError(); // openal_2.14+
+// ALenum alc_error = alcGetError(); // openal_2.14+
#else
ALenum alc_error = alcGetError(NULL); // openal_2.14+
#endif
@@ -316,7 +316,7 @@
void SND_OpenALDevice::MakeCurrent() const
{
#ifdef WIN32
- alcMakeContextCurrent(m_context);
+ alcMakeContextCurrent((ALCcontext *)m_context);
#endif
}
--- blender\source\blender\ftfont\intern\FTF_TTFont.cpp Thu Mar 10 03:45:54 2005
+++ blender-2.4.1\source\blender\ftfont\intern\FTF_TTFont.cpp Mon Feb 06 07:30:29 2006
@@ -251,11 +251,11 @@
sprintf(envstr, "LANG=%s", str);
envstr[strlen(envstr)]='\0';
-#ifdef _WIN32
- gettext_putenv(envstr);
-#else
+//#ifdef _WIN32
+// gettext_putenv(envstr);
+//#else
putenv(envstr);
-#endif
+//#endif
#else
char *locreturn = setlocale(LC_ALL, str);
if (locreturn == NULL) {
--- blender\source\blender\makesdna\intern\SConscript Fri Aug 05 00:05:28 2005
+++ blender-2.4.1\source\blender\makesdna\intern\SConscript Mon Feb 06 19:36:45 2006
@@ -5,6 +5,7 @@
Import ('cflags')
Import ('defines')
Import ('user_options_dict')
+cflags = []
# TODO: make sure the makesdna program does not get installed on the system.
source_files = ['makesdna.c']
@@ -18,7 +19,7 @@
makesdna_tool.Replace (PATH = user_options_dict['PATH'])
if sys.platform != 'cygwin':
- makesdna_tool.Append (CCFLAGS = cflags)
+ makesdna_tool.Append (CCFLAGS = ['/MD', '/O2', '/Ob2', '/Oi', '/Os', '/Oy', '/GT', '/GL', '/GF', '/GS-', '/GA', '/fp:fast', '/EHsc', '/J', '/W3', '/Gd', '/Gy'])
makesdna_tool.Append (LINKFLAGS = user_options_dict['PLATFORM_LINKFLAGS'])
makesdna_tool.Append (CPPDEFINES = defines)
makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib')
--- blender\source\blender\src\buttons_scene.c Fri Jan 06 20:37:45 2006
+++ blender-2.4.1\source\blender\src\buttons_scene.c Thu Feb 02 17:45:32 2006
@@ -621,17 +621,17 @@
#endif /*_WIN32 || __APPLE__ */
case B_SELECTCODEC:
-#if defined (_WIN32) || defined (__APPLE__)
- if ((G.scene->r.imtype == R_QUICKTIME)) { /* || (G.scene->r.qtcodecdata)) */
#ifdef WITH_QUICKTIME
+//#if defined (_WIN32) || defined (__APPLE__)
+ if ((G.scene->r.imtype == R_QUICKTIME)) { /* || (G.scene->r.qtcodecdata)) */
get_qtcodec_settings();
-#endif /* WITH_QUICKTIME */
}
-#if defined (_WIN32) && !defined(FREE_WINDOWS)
else
+#endif /* WITH_QUICKTIME */
+#if defined (_WIN32) && !defined(FREE_WINDOWS)
get_avicodec_settings();
#endif /* _WIN32 && !FREE_WINDOWS */
-#endif /* _WIN32 || __APPLE__ */
+//#endif /* _WIN32 || __APPLE__ */
break;
case B_PR_FULL:
@@ -1260,14 +1260,16 @@
if(G.scene->r.quality==0) G.scene->r.quality= 90;
-#ifdef WITH_QUICKTIME
+#if defined(WITH_QUICKTIME)
if (G.scene->r.imtype == R_AVICODEC || G.scene->r.imtype == R_QUICKTIME) {
-#else /* WITH_QUICKTIME */
+#elif defined(_WIN32)
+ if (G.scene->r.imtype == R_AVICODEC) {
+#else
if (0) {
-#endif
- if(G.scene->r.imtype == R_QUICKTIME) {
+#endif /* WITH_QUICKTIME */
#ifdef WITH_QUICKTIME
-#if defined (_WIN32) || defined (__APPLE__)
+ if(G.scene->r.imtype == R_QUICKTIME) {
+//#if defined (_WIN32) || defined (__APPLE__)
//glColor3f(0.65, 0.65, 0.7);
//glRecti(892,yofs+46,892+225,yofs+45+20);
if(G.scene->r.qtcodecdata == NULL)
@@ -1275,9 +1277,9 @@
else
uiDefBut(block, LABEL, 0, G.scene->r.qtcodecdata->qtcodecname, 892,yofs+44,225,20, 0, 0, 0, 0, 0, "");
uiDefBut(block, BUT,B_SELECTCODEC, "Set codec", 892,yofs,112,20, 0, 0, 0, 0, 0, "Set codec settings for Quicktime");
-#endif
-#endif /* WITH_QUICKTIME */
+//#endif
} else {
+#endif /* WITH_QUICKTIME */
#ifdef _WIN32
//glColor3f(0.65, 0.65, 0.7);
//glRecti(892,yofs+46,892+225,yofs+45+20);
@@ -1285,9 +1287,11 @@
uiDefBut(block, LABEL, 0, "Codec: not set.", 892,yofs+43,225,20, 0, 0, 0, 0, 0, "");
else
uiDefBut(block, LABEL, 0, avicodec_str(), 892,yofs+43,225,20, 0, 0, 0, 0, 0, "");
-#endif
uiDefBut(block, BUT,B_SELECTCODEC, "Set codec", 892,yofs,112,20, 0, 0, 0, 0, 0, "Set codec settings for AVI");
+#endif
+#ifdef WITH_QUICKTIME
}
+#endif /* WITH_QUICKTIME */
} else {
uiDefButS(block, NUM,B_DIFF, "Quality:", 892,yofs,112,20, &G.scene->r.quality, 10.0, 100.0, 0, 0, "Quality setting for JPEG images, AVI Jpeg and SGI movies");
}
--- blender\source\gameengine\BlenderRoutines\SConscript Tue Aug 02 05:19:41 2005
+++ blender-2.4.1\source\gameengine\BlenderRoutines\SConscript Thu Feb 02 01:27:04 2006
@@ -49,7 +49,7 @@
kx_blenderhook_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE'])
kx_blenderhook_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE'])
-if sys.platform=='win32':
- kx_blenderhook_env.Append (CXXFLAGS = ['/GR'])
+#if sys.platform=='win32':
+# kx_blenderhook_env.Append (CXXFLAGS = ['/GR'])
kx_blenderhook_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_blenderhook', source=source_files)
--- blender\source\gameengine\GamePlayer\common\SConscript Mon Mar 14 22:56:40 2005
+++ blender-2.4.1\source\gameengine\GamePlayer\common\SConscript Thu Feb 02 01:27:04 2006
@@ -67,7 +67,7 @@
gp_common_env.Append (CPPPATH = user_options_dict['PNG_INCLUDE'])
gp_common_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
-if sys.platform=='win32':
- gp_common_env.Append (CXXFLAGS = ['/GR'])
+#if sys.platform=='win32':
+# gp_common_env.Append (CXXFLAGS = ['/GR'])
gp_common_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/GPC_common', source=source_files)
--- blender\source\gameengine\GamePlayer\ghost\GPG_Application.cpp Tue Jan 17 06:27:29 2006
+++ blender-2.4.1\source\gameengine\GamePlayer\ghost\GPG_Application.cpp Fri Feb 03 01:49:47 2006
@@ -202,7 +202,7 @@
BOOL CALLBACK findGhostWindowHWNDProc(HWND hwnd, LPARAM lParam)
{
- GHOST_IWindow *p = (GHOST_IWindow*) GetWindowLong(hwnd, GWL_USERDATA);
+ GHOST_IWindow *p = (GHOST_IWindow*) GetWindowLongPtr(hwnd, GWLP_USERDATA);
BOOL ret = TRUE;
if (p == ghost_window_to_find)
{
@@ -286,8 +286,8 @@
if (ghost_hwnd != NULL)
{
GetCursorPos(&scr_save_mouse_pos);
- ghost_wnd_proc = (WNDPROC) GetWindowLong(ghost_hwnd, GWL_WNDPROC);
- SetWindowLong(ghost_hwnd,GWL_WNDPROC, (LONG) screenSaverWindowProc);
+ ghost_wnd_proc = (WNDPROC) GetWindowLongPtr(ghost_hwnd, GWLP_WNDPROC);
+ SetWindowLongPtr(ghost_hwnd, GWLP_WNDPROC, (LONG_PTR) screenSaverWindowProc);
}
}
return ret;
@@ -489,7 +489,8 @@
return false;
// SYS_WriteCommandLineInt(syshandle, "fixedtime", 0);
- // SYS_WriteCommandLineInt(syshandle, "vertexarrays",1);
+ // SYS_WriteCommandLineInt(syshandle, "vertexarrays",1);
+ bool usefixedtime = (SYS_GetCommandLineInt(syshandle, "fixedtime", 0) != 0);
bool properties = (SYS_GetCommandLineInt(syshandle, "show_properties", 0) != 0);
bool profile = (SYS_GetCommandLineInt(syshandle, "show_profile", 0) != 0);
bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
@@ -569,7 +570,7 @@
m_ketsjiengine->SetAudioDevice(m_audiodevice);
m_ketsjiengine->SetTimingDisplay(frameRate, false, false);
- m_ketsjiengine->SetUseFixedTime(false);
+ m_ketsjiengine->SetUseFixedTime(usefixedtime);
m_ketsjiengine->SetTimingDisplay(frameRate, profile, properties);
m_engineInitialized = true;
--- blender\source\gameengine\GamePlayer\ghost\GPG_ghost.cpp Fri Jan 06 11:46:52 2006
+++ blender-2.4.1\source\gameengine\GamePlayer\ghost\GPG_ghost.cpp Fri Feb 03 05:50:28 2006
@@ -59,7 +59,9 @@
extern "C"
{
#endif // __cplusplus
-
+
+#include "BKE_global.h"
+
#include "BLI_blenlib.h"
#include "DNA_scene_types.h"
#include "BLO_readfile.h"
@@ -593,7 +595,7 @@
}
//::printf("game data loaded from %s\n", filename);
-
+
if (!bfd) {
usage(argv[0]);
error = true;
@@ -601,6 +603,24 @@
}
else
{
+
+ /* User defined settings */
+ int a = 0;
+
+ a= (bfd->fileflags & G_FILE_SHOW_FRAMERATE);
+ SYS_WriteCommandLineInt(syshandle, "show_framerate", a);
+
+ a= (bfd->fileflags & G_FILE_SHOW_PROFILE);
+ SYS_WriteCommandLineInt(syshandle, "show_profile", a);
+
+ a = (bfd->fileflags & G_FILE_SHOW_DEBUG_PROPS);
+ SYS_WriteCommandLineInt(syshandle, "show_properties", a);
+
+ a= (bfd->fileflags & G_FILE_ENABLE_ALL_FRAMES);
+ SYS_WriteCommandLineInt(syshandle, "fixedtime", a);
+
+ a=(bfd->fileflags & G_FILE_GAME_MAT);
+ SYS_WriteCommandLineInt(syshandle, "blender_material", a);
#ifdef WIN32
#ifdef NDEBUG
if (closeConsole)
@@ -615,7 +635,7 @@
char *startscenename = scene->id.name + 2;
titlename = maggie->name;
-
+
// Check whether the game should be displayed full-screen
if ((!fullScreenParFound) && (!windowParFound))
{
--- blender\source\gameengine\GamePlayer\ghost\SConscript Fri Jun 04 20:58:45 2004
+++ blender-2.4.1\source\gameengine\GamePlayer\ghost\SConscript Thu Feb 02 01:27:04 2006
@@ -46,7 +46,7 @@
gp_ghost_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
gp_ghost_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
-if sys.platform=='win32':
- gp_ghost_env.Append (CXXFLAGS = ['/GR'])
+#if sys.platform=='win32':
+# gp_ghost_env.Append (CXXFLAGS = ['/GR'])
gp_ghost_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/GPG_ghost', source=source_files)
\ No newline at end of file
--- blender\source\gameengine\Ketsji\SConscript Sun Jan 08 17:37:15 2006
+++ blender-2.4.1\source\gameengine\Ketsji\SConscript Mon Feb 06 19:36:47 2006
@@ -116,8 +116,8 @@
])
if sys.platform == 'win32':
- ketsji_env.Append (CXXFLAGS = ['/GR'])
- ketsji_env.Append ( CCFLAGS =['/Ox'])
+# ketsji_env.Append (CXXFLAGS = ['/GR'])
+ ketsji_env.Append (CCFLAGS =['/MD', '/O2', '/Ob2', '/Oi', '/Os', '/Oy', '/GT', '/GL', '/GF', '/GS-', '/GA', '/fp:fast', '/EHsc', '/J', '/W3', '/Gd', '/Gy'])
ketsji_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
ketsji_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE'])
ketsji_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE'])
--- blender\source\gameengine\Physics\Bullet\SConscript Tue Aug 02 05:19:41 2005
+++ blender-2.4.1\source\gameengine\Physics\Bullet\SConscript Mon Feb 06 19:36:49 2006
@@ -16,7 +16,7 @@
if sys.platform=='win32':
- phy_bullet_env.Append (CXXFLAGS = ['/GR'])
- phy_bullet_env.Append (CCFLAGS =['/O2'])
+# phy_bullet_env.Append (CXXFLAGS = ['/GR'])
+ phy_bullet_env.Append (CCFLAGS =['/MD', '/O2', '/Ob2', '/Oi', '/Os', '/Oy', '/GT', '/GL', '/GF', '/GS-', '/GA', '/fp:fast', '/EHsc', '/J', '/W3', '/Gd', '/Gy'])
phy_bullet_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Bullet', source=source_files)
--- blender\source\gameengine\Physics\Sumo\SConscript Sat Mar 26 21:41:15 2005
+++ blender-2.4.1\source\gameengine\Physics\Sumo\SConscript Mon Feb 06 19:36:51 2006
@@ -23,7 +23,7 @@
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.Append (CXXFLAGS = ['/GR'])
+ phy_sumo_env.Append (CCFLAGS =['/MD', '/O2', '/Ob2', '/Oi', '/Os', '/Oy', '/GT', '/GL', '/GF', '/GS-', '/GA', '/fp:fast', '/EHsc', '/J', '/W3', '/Gd', '/Gy'])
phy_sumo_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files)
--- blender\source\gameengine\Rasterizer\SConscript Sun May 16 21:07:16 2004
+++ blender-2.4.1\source\gameengine\Rasterizer\SConscript Wed Feb 01 20:19:58 2006
@@ -21,7 +21,7 @@
'#intern/moto/include'
])
-if sys.platform=='win32':
- ras_rasterizer_env.Append ( CCFLAGS =['/Ox'])
+#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)
--- blender\SConstruct Mon Jan 23 06:46:29 2006
+++ blender-2.4.1\SConstruct Mon Feb 06 19:25:07 2006
@@ -360,11 +360,11 @@
openal_include = []
elif sys.platform == 'win32':
- use_international = 'true'
+ use_international = 'false'
use_gameengine = 'true'
use_openal = 'true'
use_fmod = 'false'
- use_quicktime = 'true'
+ use_quicktime = 'false'
use_bullet = 'true'
use_sumo = 'true'
use_ode = 'false'
@@ -374,37 +374,31 @@
build_blender_static = 'false'
build_blender_player = 'true'
build_blender_plugin = 'false'
- release_flags = ['/Og', '/Ot', '/Ob1', '/Op', '/G6']
+ release_flags = ['/MD', '/O2', '/Ob2', '/Oi', '/Os', '/Oy', '/GT', '/GL', '/GF', '/GS-', '/GA', '/fp:fast']
debug_flags = ['/Zi', '/Fr${TARGET.base}.sbr']
- extra_flags = ['/EHsc', '/J', '/W3', '/Gd', '/MT']
+ extra_flags = ['/EHsc', '/J', '/W3', '/Gd', '/Gy']
cxxflags = []
- defines = ['WIN32', '_CONSOLE']
+ defines = ['WIN32', '_WIN64', '_CRT_SECURE_NO_DEPRECATE', '_CONSOLE']
if use_quicktime == 'true':
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',
+ platform_libs = ['ws2_32', 'dxguid', 'vfw32', 'winmm',
+ 'kernel32', 'user32', 'gdi32',
'comdlg32', 'advapi32', 'shell32',
- 'ole32', 'oleaut32', 'uuid',
- 'libcmt', 'libc']
+ 'ole32', 'oleaut32', 'uuid']
platform_libpath = ['#../lib/windows/iconv/lib',
'#../lib/windows/QTDevWin/Libraries']
platform_linkflags = [
+ '/LTCG',
+ '/RELEASE',
'/SUBSYSTEM:CONSOLE',
- '/MACHINE:IX86',
+ '/MACHINE:X64',
'/ENTRY:mainCRTStartup',
- '/INCREMENTAL:NO',
- '/NODEFAULTLIB:"msvcprt.lib"',
+ '/OPT:REF,ICF,NOWIN98',
'/NODEFAULTLIB:"glut32.lib"',
- '/NODEFAULTLIB:"libcd.lib"',
- #'/NODEFAULTLIB:"libc.lib"',
- '/NODEFAULTLIB:"libcpd.lib"',
- '/NODEFAULTLIB:"libcp.lib"',
- '/NODEFAULTLIB:"libcmtd.lib"',
- ]
+ '/NODEFAULTLIB:"libcmt.lib"']
window_system = 'WIN32'
extra_includes = []
if use_quicktime == 'true':

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
1a/59/bf38819d61eed013dcc24a7257ac

Event Timeline