[Csp-commits] svn:csp r1894 - in trunk/csp: . modules/chunklod

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-14 09:46:29 -0700 (Fri, 14 Apr 2006)
New Revision: 1894

Modified:
   trunk/csp/SConstruct
   trunk/csp/modules/chunklod/SConscript
Log:
Remove msvcrt as an explicit library from the windows build.  Should
not be necessary any more and was causing link errors for ChunkLod.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1894

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2006-04-14 06:41:28 UTC (rev 1893)
+++ trunk/csp/SConstruct	2006-04-14 16:46:29 UTC (rev 1894)
@@ -78,7 +78,7 @@
 	name = 'windows',
 	config = [
 		build.WindowsLibConfig('advapi32'),
-		build.WindowsLibConfig('msvcrt', symbol='_toupper'),
+		#build.WindowsLibConfig('msvcrt', symbol='_toupper'),
 		build.WindowsLibConfig('ws2_32'),
 	])
 

Modified: trunk/csp/modules/chunklod/SConscript
===================================================================
--- trunk/csp/modules/chunklod/SConscript	2006-04-14 06:41:28 UTC (rev 1893)
+++ trunk/csp/modules/chunklod/SConscript	2006-04-14 16:46:29 UTC (rev 1894)
@@ -26,7 +26,7 @@
 
 # to remove conflicts with MSVCRT
 if env['PLATFORM'].startswith('win'):
-	env.AppendUnique(SHLINKFLAGS=Split('/NODEFAULTLIB:LIBC'))
+	env.AppendUnique(SHLINKFLAGS=Split('/NODEFAULTLIB:LIBCMT'))
 
 build.SharedLibrary(env,
 	name = 'chunklod',