[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17738] branches/blender2.5/blender: * blenderlite works now on windows too.

[Nathan Letwory]

Revision: 17738
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17738
Author:   jesterking
Date:     2008-12-07 14:22:50 +0100 (Sun, 07 Dec 2008)

Log Message:
-----------
* blenderlite works now on windows too.
  - when WITH_BF_SDL=True entry-point is mainCTRStartup (due to SDL)
  - with WITH_BF_SDL=False this should be just main

Modified Paths:
--------------
    branches/blender2.5/blender/SConstruct
    branches/blender2.5/blender/config/win32-vc-config.py
    branches/blender2.5/blender/tools/Blender.py

Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct	2008-12-07 12:15:04 UTC (rev 17737)
+++ branches/blender2.5/blender/SConstruct	2008-12-07 13:22:50 UTC (rev 17738)
@@ -284,6 +284,10 @@
 	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']

Modified: branches/blender2.5/blender/config/win32-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-vc-config.py	2008-12-07 12:15:04 UTC (rev 17737)
+++ branches/blender2.5/blender/config/win32-vc-config.py	2008-12-07 13:22:50 UTC (rev 17738)
@@ -183,19 +183,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','/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'

Modified: branches/blender2.5/blender/tools/Blender.py
===================================================================
--- branches/blender2.5/blender/tools/Blender.py	2008-12-07 12:15:04 UTC (rev 17737)
+++ branches/blender2.5/blender/tools/Blender.py	2008-12-07 13:22:50 UTC (rev 17738)
@@ -457,7 +457,7 @@
 		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':