diff options
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 14 | ||||
| -rw-r--r-- | tools/Blender.py | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/SConstruct b/SConstruct index 0bc05a59df2..bf5356a4073 100644 --- a/SConstruct +++ b/SConstruct @@ -284,6 +284,10 @@ if 'blenderlite' in B.targets: env['BF_NO_ELBEEM'] = True env['WITH_BF_PYTHON'] = False +if env['WITH_BF_SDL'] == False and env['OURPLATFORM'] in ('win32-vc', 'win32-ming'): + env['PLATFORM_LINKFLAGS'].remove('/ENTRY:mainCRTStartup') + env['PLATFORM_LINKFLAGS'].append('/ENTRY:main') + # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir #B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep) B.root_build_dir = env['BF_BUILDDIR'] diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index fe51abe0a89..f6f97f5e982 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -183,19 +183,7 @@ CXX_WARN = [] 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','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE'] BF_BUILDDIR = '..\\build\\win32-vc' BF_INSTALLDIR='..\\install\\win32-vc' diff --git a/tools/Blender.py b/tools/Blender.py index 3b5e33eda59..240534d4437 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -457,7 +457,7 @@ class BlenderEnvironment(SConsEnvironment): print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC lenv = self.Clone() if lenv['OURPLATFORM'] in ['win32-vc', 'cygwin']: - lenv.Append(LINKFLAGS = Split(lenv['PLATFORM_LINKFLAGS'])) + lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS']) if lenv['BF_DEBUG']: lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb']) if lenv['OURPLATFORM']=='linux2': |