Linux: Compiling with nowx=true now builds the entire project without WX, this isn't tested in Windows so it's always on via Common.h, You can test/fix it yourself that way. Also fixed Compiling again

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@762 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2008-10-04 07:57:28 +00:00
parent 3d475abf2b
commit 9a3ebd0c3b
22 changed files with 135 additions and 101 deletions

View File

@ -6,22 +6,19 @@ 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 = [
'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
]
if not env['nowx']:
files.Append['ConfigMain.cpp', 'FilesystemViewer.cpp', 'Frame.cpp', 'GameListCtrl.cpp', 'MemcardManager.cpp', 'PluginManager.cpp',]
libs.Append['debwx', ]
wxenv = env.Clone()
wxenv.Append(
@ -30,7 +27,7 @@ wxenv.Append(
'wxNEEDS_CHARPP',
],
LINKFLAGS = [
'-pthread',
'-lpthread',
],
LIBS = libs
)
@ -64,5 +61,6 @@ else:
exeNoGUI = '../../../../Binary/linux/DolphinNoGUI'
objects = [ wxenv.Object(srcFile) for srcFile in files ]
wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
if not env['nowx']:
wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ])