wtf

SConstruct

@@ -173,6 +173,8 @@ for p in platform_list:
 	env.Append(CCFLAGS=string.split(str(CCFLAGS)))
 	detect.configure(env)
 	env['platform'] = p
+        if not env.has_key('platform_libsuffix'):
+                env['platform_libsuffix'] = env['LIBSUFFIX']
 	sys.path.remove("./platform/"+p)
 	sys.modules.pop('detect')
 

core/SCsub

@@ -32,7 +32,7 @@ SConscript('math/SCsub');
 SConscript('io/SCsub');
 SConscript('bind/SCsub');
 
-lib = env.Library("core",env.core_sources)
+lib = env.Library("core",env.core_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 

drivers/SCsub

@@ -75,7 +75,7 @@ if len(list) > 0:
 
 drivers_base=[]
 env.add_source_files(drivers_base,"*.cpp")
-lib_list.insert(0, env.Library("drivers", drivers_base))
+lib_list.insert(0, env.Library("drivers", drivers_base, LIBSUFFIX=env['platform_libsuffix']))
 
 env.Prepend(LIBS=lib_list)
 

main/SCsub

@@ -5,7 +5,7 @@ env.add_source_files(env.main_sources,"*.cpp")
 
 Export('env')
 
-lib = env.Library("main",env.main_sources)
+lib = env.Library("main",env.main_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 

modules/SCsub

@@ -17,7 +17,7 @@ for x in env.module_list:
 	env_modules.Append(CPPFLAGS=["-DMODULE_"+x.upper()+"_ENABLED"])
 	SConscript(x+"/SCsub")
 
-lib = env_modules.Library("modules",env.modules_sources)
+lib = env_modules.Library("modules",env.modules_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 

platform/windows/detect.py

@@ -66,7 +66,9 @@ def configure(env):
 	if (env["tools"]=="no"):
 		#no tools suffix
 		env['OBJSUFFIX'] = ".nt"+env['OBJSUFFIX']
-		env['LIBSUFFIX'] = ".nt"+env['LIBSUFFIX']
+		#env['LIBSUFFIX'] = ".nt"+env['LIBSUFFIX']
+		env['platform_libsuffix'] = ".nt"+env['LIBSUFFIX']
+
 
 
 	if (os.name=="nt" and os.getenv("VSINSTALLDIR")!=None):

platform/x11/SCsub

@@ -7,7 +7,4 @@ common_x11=[\
 	"key_mapping_x11.cpp",\
 ]
 
-if env["target"]=="release":
-	env.Program('#bin/godot_rel',['godot_x11.cpp']+common_x11)
-else:
-	env.Program('#bin/godot',['godot_x11.cpp']+common_x11)
+env.Program('#bin/godot',['godot_x11.cpp']+common_x11)

scene/SCsub

@@ -15,7 +15,7 @@ SConscript('resources/SCsub');
 SConscript('io/SCsub');
 
 
-lib = env.Library("scene",env.scene_sources)
+lib = env.Library("scene",env.scene_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 

script/SCsub

@@ -9,7 +9,7 @@ if (env["gdscript"]=="yes"):
 	SConscript('gdscript/SCsub');
 SConscript('multiscript/SCsub');
 
-lib = env.Library("script",env.script_sources)
+lib = env.Library("script",env.script_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 

servers/SCsub

@@ -12,7 +12,7 @@ SConscript('audio/SCsub');
 SConscript('spatial_sound/SCsub');
 SConscript('spatial_sound_2d/SCsub');
 
-lib = env.Library("servers",env.servers_sources)
+lib = env.Library("servers",env.servers_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 

tools/SCsub

@@ -12,7 +12,7 @@ SConscript('docdump/SCsub');
 SConscript('freetype/SCsub');
 SConscript('doc/SCsub');
 
-lib = env.Library("tool",env.tool_sources)
+lib = env.Library("tool",env.tool_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])