Reverted r762 and r763 - i don't see any good reason to keep this revision as long as nobody fixes the windows build (btw: i don't understand why we need a non-WX build at all). if someone is going to fix it he can revert this revision.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@766 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DolphinWX/Src/SConscript

@@ -6,19 +6,22 @@ import sys
 files = [
 	'BootManager.cpp',
 	'Config.cpp',
+	'ConfigMain.cpp',
 	'FileSearch.cpp',
+	'FilesystemViewer.cpp',
+	'Frame.cpp',
+	'GameListCtrl.cpp',
 	'Globals.cpp',
 	'ISOFile.cpp',
+	'MemcardManager.cpp',
 	'MemoryCards/GCMemcard.cpp',
+	'PluginManager.cpp',
 	'stdafx.cpp',
 	'cmdline.c',
 	]
 libs = [
-	'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
+	'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
 	]
-if not env['nowx']:
-	files += ['ConfigMain.cpp', 'FilesystemViewer.cpp', 'Frame.cpp', 'GameListCtrl.cpp', 'MemcardManager.cpp', 'PluginManager.cpp',]
-	libs += ['debwx', ]
 
 wxenv = env.Clone()
 wxenv.Append(
@@ -27,7 +30,7 @@ wxenv.Append(
 		'wxNEEDS_CHARPP',
 		],
 	LINKFLAGS = [
-		'-lpthread',
+		'-pthread',
 		],
 	LIBS = libs
 	)
@@ -61,6 +64,5 @@ else:
 	exeNoGUI = '../../../../Binary/linux/DolphinNoGUI'
 
 objects = [ wxenv.Object(srcFile) for srcFile in files ]
-if not env['nowx']:
-	wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])	
+wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
 wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ])