From 580193658ab4922d46b0c91d6d1c8e49740ab929 Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Sat, 4 Oct 2008 08:27:56 +0000 Subject: [PATCH] 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 --- SConstruct | 4 ++-- Source/Core/DolphinWX/Src/SConscript | 4 ++-- Source/Plugins/Plugin_DSP_HLE/Src/SConscript | 2 +- Source/Plugins/Plugin_PadSimple/Src/SConscript | 2 +- Source/Plugins/Plugin_VideoOGL/Src/SConscript | 2 +- Source/Plugins/Plugin_nJoy_SDL/Src/SConscript | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 15dce09a62..de90b3fd17 100644 --- a/SConstruct +++ b/SConstruct @@ -182,7 +182,7 @@ if not env['nowx']: print 'gui build requires wxwidgets >= 2.8' Exit(1) if not env['nowx']: - dirs.Append['Source/Core/DebuggerWX/Src',] + dirs += ['Source/Core/DebuggerWX/Src',] # After all configuration tests are done env = conf.Finish() @@ -190,7 +190,7 @@ env = conf.Finish() #wx windows flags if not env['nowx']: wxconfig.ParseWXConfig(env) - compileFlags.append('-DUSE_WX') + compileFlags += ['-DUSE_WX',] #get sdl stuff env.ParseConfig('sdl-config --cflags --libs') diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index e7e5d1244e..c512798a26 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -17,8 +17,8 @@ libs = [ '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', ] + files += ['ConfigMain.cpp', 'FilesystemViewer.cpp', 'Frame.cpp', 'GameListCtrl.cpp', 'MemcardManager.cpp', 'PluginManager.cpp',] + libs += ['debwx', ] wxenv = env.Clone() wxenv.Append( diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript index 562cbd5597..ca050329c0 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript @@ -25,7 +25,7 @@ files = [ 'UCodes/UCode_Zelda.cpp', ] 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.Append( diff --git a/Source/Plugins/Plugin_PadSimple/Src/SConscript b/Source/Plugins/Plugin_PadSimple/Src/SConscript index b1d5355bea..a35379f2c3 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/SConscript +++ b/Source/Plugins/Plugin_PadSimple/Src/SConscript @@ -12,7 +12,7 @@ files = [ "PadSimple.cpp", ] if not env['nowx']: - files.Append["GUI/ConfigDlg.cpp", "XInputBase.cpp",] + files += ["GUI/ConfigDlg.cpp", "XInputBase.cpp",] padenv = env.Clone() padenv.Append(LIBS = [ 'common', 'X11' ]) padenv.SharedLibrary(output, files) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index aa56322864..5107a3558b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -25,7 +25,7 @@ files = [ 'XFB.cpp', ] if not env['nowx']: - files.Append['GUI/ConfigDlg.cpp',] + files += ['GUI/ConfigDlg.cpp',] compileFlags = [ '-fPIC', ] diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript b/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript index 8490a8becd..661b0c9d89 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript @@ -12,7 +12,7 @@ files = [ 'nJoy.cpp', ] if not env['nowx']: - files.Append['GUI/AboutBox.cpp', 'GUI/ConfigBox.cpp',] + files += ['GUI/AboutBox.cpp', 'GUI/ConfigBox.cpp',] padenv = env.Clone() padenv.Append(