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

@ -61,7 +61,6 @@ dirs = [
'Externals/LZO',
'Source/Core/Core/Src',
'Source/Core/DiscIO/Src',
'Source/Core/DebuggerWX/Src',
'Source/Core/VideoCommon/Src',
'Source/Plugins/Plugin_VideoOGL/Src',
'Source/Plugins/Plugin_DSP_HLE/Src',
@ -72,7 +71,7 @@ dirs = [
'Source/Plugins/Plugin_Wiimote_Test/Src',
'Source/Core/DolphinWX/Src',
]
builders = {}
if sys.platform == 'darwin':
from plistlib import writePlist
@ -182,6 +181,8 @@ if not env['nowx']:
):
print 'gui build requires wxwidgets >= 2.8'
Exit(1)
if not env['nowx']:
dirs.Append['Source/Core/DebuggerWX/Src',]
# After all configuration tests are done
env = conf.Finish()
@ -189,6 +190,7 @@ env = conf.Finish()
#wx windows flags
if not env['nowx']:
wxconfig.ParseWXConfig(env)
compileFlags.append('-DUSE_WX')
#get sdl stuff
env.ParseConfig('sdl-config --cflags --libs')