ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Woops, SConscripts were broken, fixed. I think I broke using wx..maybe. Too tired to fix right now, must sleep 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@763 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2008-10-04 08:27:56 +00:00
parent 9a3ebd0c3b
commit 580193658a
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -182,7 +182,7 @@ if not env['nowx']:
print 'gui build requires wxwidgets >= 2.8' print 'gui build requires wxwidgets >= 2.8'
Exit(1) Exit(1)
if not env['nowx']: if not env['nowx']:
dirs.Append['Source/Core/DebuggerWX/Src',] dirs += ['Source/Core/DebuggerWX/Src',]
# After all configuration tests are done # After all configuration tests are done
env = conf.Finish() env = conf.Finish()
@ -190,7 +190,7 @@ env = conf.Finish()
#wx windows flags #wx windows flags
if not env['nowx']: if not env['nowx']:
wxconfig.ParseWXConfig(env) wxconfig.ParseWXConfig(env)
compileFlags.append('-DUSE_WX') compileFlags += ['-DUSE_WX',]
#get sdl stuff #get sdl stuff
env.ParseConfig('sdl-config --cflags --libs') env.ParseConfig('sdl-config --cflags --libs')

4
Source/Core/DolphinWX/Src/SConscript
View File

@ -17,8 +17,8 @@ libs = [
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z' 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
] ]
if not env['nowx']: if not env['nowx']:
files.Append['ConfigMain.cpp', 'FilesystemViewer.cpp', 'Frame.cpp', 'GameListCtrl.cpp', 'MemcardManager.cpp', 'PluginManager.cpp',] files += ['ConfigMain.cpp', 'FilesystemViewer.cpp', 'Frame.cpp', 'GameListCtrl.cpp', 'MemcardManager.cpp', 'PluginManager.cpp',]
libs.Append['debwx', ] libs += ['debwx', ]
wxenv = env.Clone() wxenv = env.Clone()
wxenv.Append( wxenv.Append(

2
Source/Plugins/Plugin_DSP_HLE/Src/SConscript
View File

@ -25,7 +25,7 @@ files = [
'UCodes/UCode_Zelda.cpp', 'UCodes/UCode_Zelda.cpp',
] ]
if not env['nowx']: if not env['nowx']:
files.Append['Debugger/Debugger.cpp', 'Debugger/PBView.cpp', 'Logging/Logging.cpp',] files += ['Debugger/Debugger.cpp', 'Debugger/PBView.cpp', 'Logging/Logging.cpp',]
dspenv = env.Clone() dspenv = env.Clone()
dspenv.Append( dspenv.Append(

2
Source/Plugins/Plugin_PadSimple/Src/SConscript
View File

@ -12,7 +12,7 @@ files = [
"PadSimple.cpp", "PadSimple.cpp",
] ]
if not env['nowx']: if not env['nowx']:
files.Append["GUI/ConfigDlg.cpp", "XInputBase.cpp",] files += ["GUI/ConfigDlg.cpp", "XInputBase.cpp",]
padenv = env.Clone() padenv = env.Clone()
padenv.Append(LIBS = [ 'common', 'X11' ]) padenv.Append(LIBS = [ 'common', 'X11' ])
padenv.SharedLibrary(output, files) padenv.SharedLibrary(output, files)

2
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -25,7 +25,7 @@ files = [
'XFB.cpp', 'XFB.cpp',
] ]
if not env['nowx']: if not env['nowx']:
files.Append['GUI/ConfigDlg.cpp',] files += ['GUI/ConfigDlg.cpp',]
compileFlags = [ compileFlags = [
'-fPIC', '-fPIC',
] ]

2
Source/Plugins/Plugin_nJoy_SDL/Src/SConscript
View File

@ -12,7 +12,7 @@ files = [
'nJoy.cpp', 'nJoy.cpp',
] ]
if not env['nowx']: if not env['nowx']:
files.Append['GUI/AboutBox.cpp', 'GUI/ConfigBox.cpp',] files += ['GUI/AboutBox.cpp', 'GUI/ConfigBox.cpp',]
padenv = env.Clone() padenv = env.Clone()
padenv.Append( padenv.Append(