From a2b1f829cb1064ff57ee0a3f6d41a7fd1b672dab Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Mon, 19 Jul 2010 03:42:37 +0000 Subject: [PATCH] Get rid of a number of unnecessary env.Clones. Use SCons' convenient # shorthand for the root of our tree. Also various minor cleanup of SConscripts. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5915 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/Bochs_disasm/SConscript | 2 +- Externals/LZO/SConscript | 2 +- Externals/Lua/SConscript | 68 +++++++++---------- Externals/MemcardManager/SConscript | 19 +----- Externals/SDL/SConscript | 45 +----------- Externals/SFML/src/SConscript | 5 +- Externals/SOIL/SConscript | 2 +- Externals/WiiUseSrc/Src/SConscript | 42 ++++++------ Externals/zlib/SConscript | 2 +- SConstruct | 54 +++++++-------- Source/Core/AudioCommon/Src/SConscript | 35 +++++----- Source/Core/Common/Src/Common.h | 5 ++ .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 1 + Source/Core/Core/Src/SConscript | 9 ++- Source/Core/DSPCore/Src/SConscript | 48 ++++++------- Source/Core/DebuggerUICommon/Src/SConscript | 1 - Source/Core/DebuggerWX/Src/SConscript | 30 ++++---- Source/Core/DiscIO/Src/SConscript | 3 +- Source/Core/DolphinWX/Src/SConscript | 33 ++++----- Source/Core/InputUICommon/Src/SConscript | 1 - Source/Core/VideoCommon/Src/SConscript | 6 +- Source/DSPTool/Src/SConscript | 17 ++--- Source/Plugins/Plugin_DSP_HLE/Src/SConscript | 17 ++--- Source/Plugins/Plugin_DSP_LLE/Src/SConscript | 22 ++---- Source/Plugins/Plugin_VideoOGL/Src/SConscript | 27 ++------ .../Plugin_VideoSoftware/Src/SConscript | 19 ++---- Source/Plugins/Plugin_Wiimote/Src/SConscript | 28 +++----- .../Plugins/Plugin_WiimoteNew/Src/SConscript | 17 ++--- Source/UnitTests/SConscript | 10 +-- 29 files changed, 223 insertions(+), 347 deletions(-) diff --git a/Externals/Bochs_disasm/SConscript b/Externals/Bochs_disasm/SConscript index ea62e8c8d8..3e5c48c325 100644 --- a/Externals/Bochs_disasm/SConscript +++ b/Externals/Bochs_disasm/SConscript @@ -1,4 +1,4 @@ -# -*- python -*- +# -*- python -*- Import('env') import sys diff --git a/Externals/LZO/SConscript b/Externals/LZO/SConscript index a3fecb668c..96ee32cf24 100644 --- a/Externals/LZO/SConscript +++ b/Externals/LZO/SConscript @@ -1,4 +1,4 @@ -# -*- python -*- +# -*- python -*- Import('env') diff --git a/Externals/Lua/SConscript b/Externals/Lua/SConscript index 520ed8b17b..ab8496d3e9 100644 --- a/Externals/Lua/SConscript +++ b/Externals/Lua/SConscript @@ -1,44 +1,44 @@ -# -*- python -*- +# -*- python -*- -import sys Import('env') +import sys luaenv = env.Clone() if not sys.platform == 'win32': - luaenv['CPPDEFINES'].append('LUA_USE_LINUX') # Also works for OS X + luaenv['CPPDEFINES'].append('LUA_USE_LINUX') # Also works for OS X files = [ - 'lapi.c', - 'lauxlib.c', - 'lbaselib.c', - 'lcode.c', - 'ldblib.c', - 'ldebug.c', - 'ldo.c', - 'ldump.c', - 'lfunc.c', - 'lgc.c', - 'linit.c', - 'liolib.c', - 'llex.c', - 'lmathlib.c', - 'lmem.c', - 'loadlib.c', - 'lobject.c', - 'lopcodes.c', - 'loslib.c', - 'lparser.c', - 'lstate.c', - 'lstring.c', - 'lstrlib.c', - 'ltable.c', - 'ltablib.c', - 'ltm.c', - 'lundump.c', - 'lvm.c', - 'lzio.c', - 'print.c', - ] + 'lapi.c', + 'lauxlib.c', + 'lbaselib.c', + 'lcode.c', + 'ldblib.c', + 'ldebug.c', + 'ldo.c', + 'ldump.c', + 'lfunc.c', + 'lgc.c', + 'linit.c', + 'liolib.c', + 'llex.c', + 'lmathlib.c', + 'lmem.c', + 'loadlib.c', + 'lobject.c', + 'lopcodes.c', + 'loslib.c', + 'lparser.c', + 'lstate.c', + 'lstring.c', + 'lstrlib.c', + 'ltable.c', + 'ltablib.c', + 'ltm.c', + 'lundump.c', + 'lvm.c', + 'lzio.c', + 'print.c', + ] luaenv.StaticLibrary(env['local_libs'] + "lua", files) diff --git a/Externals/MemcardManager/SConscript b/Externals/MemcardManager/SConscript index 4299c1d0d8..394437b8a9 100644 --- a/Externals/MemcardManager/SConscript +++ b/Externals/MemcardManager/SConscript @@ -1,14 +1,13 @@ # -*- python -*- Import('env') -import sys if not env['HAVE_WX']: Return() -wxenv = env.Clone() - files = [ + 'src/mcmMain.cpp', + 'src/MCMdebug.cpp', ] libs = [ @@ -16,18 +15,6 @@ libs = [ 'common', ] -if wxenv['HAVE_WX']: - files += [ - 'src/mcmMain.cpp', - 'src/MCMdebug.cpp', - ] - -LIBS = libs - -wxenv.Append( - LIBS = libs - ) - exeGUI = env['binary_dir'] + 'MemcardManager' -wxenv.Program(exeGUI, files) +env.Program(exeGUI, files, LIBS = env['LIBS'] + libs) diff --git a/Externals/SDL/SConscript b/Externals/SDL/SConscript index 73d4318846..fb0ec823d5 100644 --- a/Externals/SDL/SConscript +++ b/Externals/SDL/SConscript @@ -1,54 +1,13 @@ -# -*- python -*- +# -*- python -*- -import sys Import('env') +import sys files = [ 'src/SDL.c', 'src/SDL_error.c', 'src/SDL_fatal.c', - #'src/audio/SDL_audio.c', - #'src/audio/SDL_audiocvt.c', - #'src/audio/SDL_audiodev.c', - #'src/audio/SDL_mixer.c', - #'src/audio/SDL_mixer_MMX.c', - #'src/audio/SDL_mixer_MMX_VC.c', - #'src/audio/SDL_mixer_m68k.c', - #'src/audio/SDL_wave.c', - #'src/cdrom/SDL_cdrom.c', - #'src/cpuinfo/SDL_cpuinfo.c', - #'src/events/SDL_active.c', - #'src/events/SDL_events.c', - #'src/events/SDL_expose.c', - #'src/events/SDL_keyboard.c', - #'src/events/SDL_mouse.c', - #'src/events/SDL_quit.c', - #'src/events/SDL_resize.c', - #'src/file/SDL_rwops.c', 'src/joystick/SDL_joystick.c', - #'src/stdlib/SDL_getenv.c', - #'src/stdlib/SDL_iconv.c', - #'src/stdlib/SDL_malloc.c', - #'src/stdlib/SDL_qsort.c', - #'src/stdlib/SDL_stdlib.c', - #'src/thread/SDL_thread.c', - #'src/timer/SDL_timer.c', - #'src/video/SDL_RLEaccel.c', - #'src/video/SDL_blit.c', - #'src/video/SDL_blit_0.c', - #'src/video/SDL_blit_1.c', - #'src/video/SDL_blit_A.c', - #'src/video/SDL_blit_N.c', - #'src/video/SDL_bmp.c', - #'src/video/SDL_cursor.c', - #'src/video/SDL_gamma.c', - #'src/video/SDL_pixels.c', - #'src/video/SDL_stretch.c', - #'src/video/SDL_surface.c', - #'src/video/SDL_video.c', - #'src/video/SDL_yuv.c', - #'src/video/SDL_yuv_mmx.c', - #'src/video/SDL_yuv_sw.c', ] if sys.platform == 'darwin': diff --git a/Externals/SFML/src/SConscript b/Externals/SFML/src/SConscript index e5130218ef..2ec3e26d6d 100644 --- a/Externals/SFML/src/SConscript +++ b/Externals/SFML/src/SConscript @@ -1,9 +1,8 @@ -# -*- python -*- +# -*- python -*- Import('env') -import sys -files = [ +files = [ "SFML/Network/Ftp.cpp", "SFML/Network/Http.cpp", "SFML/Network/IPAddress.cpp", diff --git a/Externals/SOIL/SConscript b/Externals/SOIL/SConscript index f78edceb10..dbe2788eaf 100644 --- a/Externals/SOIL/SConscript +++ b/Externals/SOIL/SConscript @@ -1,6 +1,6 @@ # -*- python -*- + Import('env') -import sys files = [ 'image_DXT.c', diff --git a/Externals/WiiUseSrc/Src/SConscript b/Externals/WiiUseSrc/Src/SConscript index 8bff77956c..d04821ac9c 100644 --- a/Externals/WiiUseSrc/Src/SConscript +++ b/Externals/WiiUseSrc/Src/SConscript @@ -1,24 +1,28 @@ -# -*- python -*- +# -*- python -*- -import sys Import('env') +import sys -if (sys.platform == 'linux2' and env['HAVE_BLUEZ'] != 1): - env['HAVE_WIIUSE'] = 0 - Return() - -files = [ - "io.c", - "ir.c", - "wiiuse.c", - ] - -if sys.platform == 'linux2' and env['HAVE_BLUEZ']: - files += [ "io_nix.c", ] - -if sys.platform == 'darwin': - files += [ "io_osx.m", ] - -env.StaticLibrary(env['local_libs'] + "wiiuse", files) +if (sys.platform == 'linux2' and not env['HAVE_BLUEZ']) or \ + (not sys.platform == 'darwin' and + not sys.platform == 'linux2' and + not sys.platform == 'win32'): + env['HAVE_WIIUSE'] = 0 + Return() env['HAVE_WIIUSE'] = 1 + +files = [ + "io.c", + "ir.c", + "wiiuse.c", + ] + +if sys.platform == 'darwin': + files += [ "io_osx.m" ] +elif sys.platform == 'linux2': + files += [ "io_nix.c" ] +elif sys.platform == 'win32': + files += [ "io_win.c" ] + +env.StaticLibrary(env['local_libs'] + "wiiuse", files) diff --git a/Externals/zlib/SConscript b/Externals/zlib/SConscript index e5bfe566b5..caabb46e8c 100644 --- a/Externals/zlib/SConscript +++ b/Externals/zlib/SConscript @@ -1,4 +1,4 @@ -# -*- python -*- +# -*- python -*- Import('env') diff --git a/SConstruct b/SConstruct index 911147a3f4..76c1c932e2 100644 --- a/SConstruct +++ b/SConstruct @@ -34,24 +34,22 @@ cppDefines = [ 'GCC_HASCLASSVISIBILITY', ] -basedir = os.getcwd() + '/' - include_paths = [ - basedir + 'Source/Core/Common/Src', - basedir + 'Source/Core/DiscIO/Src', - basedir + 'Source/PluginSpecs', - basedir + 'Source/Core/Core/Src', - basedir + 'Source/Core/DebuggerWX/Src', - basedir + 'Externals/Bochs_disasm', - basedir + 'Externals/Lua', - basedir + 'Externals/WiiUseSrc/Src', - basedir + 'Source/Core/VideoCommon/Src', - basedir + 'Source/Core/InputCommon/Src', - basedir + 'Source/Core/InputUICommon/Src', - basedir + 'Source/Core/AudioCommon/Src', - basedir + 'Source/Core/DebuggerUICommon/Src', - basedir + 'Source/Core/DolphinWX/Src', - basedir + 'Source/Core/DSPCore/Src', + '#Source/Core/Common/Src', + '#Source/Core/DiscIO/Src', + '#Source/PluginSpecs', + '#Source/Core/Core/Src', + '#Source/Core/DebuggerWX/Src', + '#Externals/Bochs_disasm', + '#Externals/Lua', + '#Externals/WiiUseSrc/Src', + '#Source/Core/VideoCommon/Src', + '#Source/Core/InputCommon/Src', + '#Source/Core/InputUICommon/Src', + '#Source/Core/AudioCommon/Src', + '#Source/Core/DebuggerUICommon/Src', + '#Source/Core/DolphinWX/Src', + '#Source/Core/DSPCore/Src', ] dirs = [ @@ -80,7 +78,6 @@ dirs = [ 'Source/UnitTests', ] - builders = {} if sys.platform == 'darwin': from plistlib import writePlist @@ -214,15 +211,12 @@ tests = {'CheckWXConfig' : wxconfig.CheckWXConfig, } # Object files -env['build_dir'] = os.path.join(basedir, 'Build', +env['build_dir'] = os.path.join('#Build', platform.system() + '-' + platform.machine() + '-' + env['flavor'] + os.sep) # Static libs go here env['local_libs'] = env['build_dir'] + os.sep + 'libs' + os.sep -# Where do we run from -env['base_dir'] = os.getcwd()+ '/' - # Install paths extra='' if flavour == 'debug': @@ -237,7 +231,7 @@ if sys.platform == 'linux2' and env['install'] == 'global': env['plugin_dir'] = env['prefix'] + 'lib/dolphin-emu/' env['data_dir'] = env['prefix'] + "share/dolphin-emu/" else: - env['prefix'] = os.path.join(env['base_dir'] + 'Binary', + env['prefix'] = os.path.join('#Binary', platform.system() + '-' + platform.machine() + extra + os.sep) env['binary_dir'] = env['prefix'] env['plugin_dir'] = env['prefix'] + 'plugins/' @@ -412,23 +406,23 @@ if not sys.platform == 'win32' and not sys.platform == 'darwin': env['LIBPATH'].insert(0, env['local_libs']) if not shared['glew']: - env['CPPPATH'] += [basedir + 'Externals/GLew/include'] + env['CPPPATH'] += ['#Externals/GLew/include'] dirs += ['Externals/GLew'] if not shared['lzo']: - env['CPPPATH'] += [basedir + 'Externals/LZO'] + env['CPPPATH'] += ['#Externals/LZO'] dirs += ['Externals/LZO'] if not shared['sdl']: - env['CPPPATH'] += [basedir + 'Externals/SDL'] - env['CPPPATH'] += [basedir + 'Externals/SDL/include'] + env['CPPPATH'] += ['#Externals/SDL'] + env['CPPPATH'] += ['#Externals/SDL/include'] dirs += ['Externals/SDL'] if not shared['soil']: - env['CPPPATH'] += [basedir + 'Externals/SOIL'] + env['CPPPATH'] += ['#Externals/SOIL'] dirs += ['Externals/SOIL'] if not shared['sfml']: - env['CPPPATH'] += [basedir + 'Externals/SFML/include'] + env['CPPPATH'] += ['#Externals/SFML/include'] dirs += ['Externals/SFML/src'] if not shared['zlib']: - env['CPPPATH'] += [basedir + 'Externals/zlib'] + env['CPPPATH'] += ['#Externals/zlib'] dirs += ['Externals/zlib'] rev = utils.GenerateRevFile(env['flavor'], diff --git a/Source/Core/AudioCommon/Src/SConscript b/Source/Core/AudioCommon/Src/SConscript index 86092a7267..581ce358f9 100644 --- a/Source/Core/AudioCommon/Src/SConscript +++ b/Source/Core/AudioCommon/Src/SConscript @@ -4,25 +4,24 @@ Import('env') import sys files = [ - 'AudioCommonConfig.cpp', - 'WaveFile.cpp', - 'Mixer.cpp', - 'AudioCommon.cpp', - ] - -if sys.platform == 'win32': - files += [ 'DSoundStream.cpp' ] + 'AudioCommonConfig.cpp', + 'WaveFile.cpp', + 'Mixer.cpp', + 'AudioCommon.cpp', + ] if sys.platform == 'darwin': - files += [ 'CoreAudioSoundStream.cpp' ] + files += [ 'CoreAudioSoundStream.cpp' ] else: - if env['HAVE_ALSA']: - files += [ 'AlsaSoundStream.cpp' ] - if env['HAVE_AO']: - files += [ 'AOSoundStream.cpp' ] - if env['HAVE_OPENAL'] or sys.platform == 'win32': - files += [ 'OpenALStream.cpp', 'aldlist.cpp' ] - if env['HAVE_PULSEAUDIO']: - files += [ 'PulseAudioStream.cpp' ] - + if env['HAVE_ALSA']: + files += [ 'AlsaSoundStream.cpp' ] + if env['HAVE_AO']: + files += [ 'AOSoundStream.cpp' ] + if env['HAVE_OPENAL'] or sys.platform == 'win32': + files += [ 'OpenALStream.cpp', 'aldlist.cpp' ] + if env['HAVE_PULSEAUDIO']: + files += [ 'PulseAudioStream.cpp' ] + if sys.platform == 'win32': + files += [ 'DSoundStream.cpp' ] + env.StaticLibrary(env['local_libs'] + 'audiocommon', files) diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index bd0534987c..03e9f50aed 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -57,6 +57,7 @@ extern const char *netplay_dolphin_ver; #undef STACKALIGN #define STACKALIGN __attribute__((__force_align_arg_pointer__)) #endif +#define HAVE_WIIUSE 1 // We use wxWidgets on OS X only if it is version 2.9+ with Cocoa support. #ifdef __WXOSX_COCOA__ #define HAVE_WX 1 @@ -114,6 +115,10 @@ extern const char *netplay_dolphin_ver; #include "Config.h" // SCons autoconfiguration defines #endif +#if defined __linux__ && HAVE_BLUEZ +#define HAVE_WIIUSE 1 +#endif + // Windows compatibility #ifndef _WIN32 #include diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 9eb1fb31ee..98e2df6474 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -71,6 +71,7 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void { // a == 0, which for these instructions imply value = 0 gpr.SetImmediate32(d, value); +// XXX soren gpr.StoreFromX64(d); } else diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript index 65dd82ee77..00e8224a20 100644 --- a/Source/Core/Core/Src/SConscript +++ b/Source/Core/Core/Src/SConscript @@ -126,16 +126,15 @@ files = [ if sys.platform == 'win32': files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp" ] elif sys.platform == 'darwin': - files += [ "HW/BBA-TAP/TAP_Apple.cpp"] + files += [ "HW/BBA-TAP/TAP_Apple.cpp" ] else: - files += [ "HW/BBA-TAP/TAP_Unix.cpp"] + files += [ "HW/BBA-TAP/TAP_Unix.cpp" ] libs = [ 'bdisasm', 'inputcommon', 'lua', - 'sfml-network' + 'sfml-network', ] -env_core = env.Clone(); -env_core.StaticLibrary(env['local_libs'] + 'core', files, LIBS=libs) +env.StaticLibrary(env['local_libs'] + 'core', files, LIBS = libs) diff --git a/Source/Core/DSPCore/Src/SConscript b/Source/Core/DSPCore/Src/SConscript index 0a6e6ac923..d678e22e73 100644 --- a/Source/Core/DSPCore/Src/SConscript +++ b/Source/Core/DSPCore/Src/SConscript @@ -3,29 +3,29 @@ Import('env') files = [ - "assemble.cpp", - "disassemble.cpp", - "DSPAccelerator.cpp", - "DSPIntCCUtil.cpp", - "DSPIntExtOps.cpp", - "DSPHWInterface.cpp", - "DSPMemoryMap.cpp", - "DSPStacks.cpp", - "DSPAnalyzer.cpp", - "DspIntArithmetic.cpp", - "DspIntBranch.cpp", - "DspIntLoadStore.cpp", - "DspIntMisc.cpp", - "DspIntMultiplier.cpp", - "DSPEmitter.cpp", - "DSPCodeUtil.cpp", - "LabelMap.cpp", - "DSPInterpreter.cpp", - "DSPCore.cpp", - "DSPTables.cpp", - "Jit/DSPJitExtOps.cpp", - "Jit/DSPJitUtil.cpp", - "Jit/DSPJitMisc.cpp", - ] + "assemble.cpp", + "disassemble.cpp", + "DSPAccelerator.cpp", + "DSPIntCCUtil.cpp", + "DSPIntExtOps.cpp", + "DSPHWInterface.cpp", + "DSPMemoryMap.cpp", + "DSPStacks.cpp", + "DSPAnalyzer.cpp", + "DspIntArithmetic.cpp", + "DspIntBranch.cpp", + "DspIntLoadStore.cpp", + "DspIntMisc.cpp", + "DspIntMultiplier.cpp", + "DSPEmitter.cpp", + "DSPCodeUtil.cpp", + "LabelMap.cpp", + "DSPInterpreter.cpp", + "DSPCore.cpp", + "DSPTables.cpp", + "Jit/DSPJitExtOps.cpp", + "Jit/DSPJitUtil.cpp", + "Jit/DSPJitMisc.cpp", + ] env.StaticLibrary(env['local_libs'] + 'dspcore', files) diff --git a/Source/Core/DebuggerUICommon/Src/SConscript b/Source/Core/DebuggerUICommon/Src/SConscript index ff05d03b40..07145a79a1 100644 --- a/Source/Core/DebuggerUICommon/Src/SConscript +++ b/Source/Core/DebuggerUICommon/Src/SConscript @@ -1,7 +1,6 @@ # -*- python -*- Import('env') -import sys if not env['HAVE_WX']: Return() diff --git a/Source/Core/DebuggerWX/Src/SConscript b/Source/Core/DebuggerWX/Src/SConscript index 847e9e4790..b40fab52ba 100644 --- a/Source/Core/DebuggerWX/Src/SConscript +++ b/Source/Core/DebuggerWX/Src/SConscript @@ -3,24 +3,24 @@ Import('env') if not env['HAVE_WX']: - Return() + Return() files = [ - "BreakpointDlg.cpp", - "BreakpointView.cpp", - "BreakpointWindow.cpp", - "CodeWindow.cpp", - "CodeWindowFunctions.cpp", - "MemoryCheckDlg.cpp", - "MemoryWindow.cpp", - "RegisterWindow.cpp", - "RegisterView.cpp", - "JitWindow.cpp", - ] + "BreakpointDlg.cpp", + "BreakpointView.cpp", + "BreakpointWindow.cpp", + "CodeWindow.cpp", + "CodeWindowFunctions.cpp", + "MemoryCheckDlg.cpp", + "MemoryWindow.cpp", + "RegisterWindow.cpp", + "RegisterView.cpp", + "JitWindow.cpp", + ] libs = [ - 'common', - 'debugger_ui_util' -] + 'common', + 'debugger_ui_util' + ] env.StaticLibrary(env['local_libs'] + "debwx", files, LIBS = libs) diff --git a/Source/Core/DiscIO/Src/SConscript b/Source/Core/DiscIO/Src/SConscript index c5582a2acc..087e3aea3a 100644 --- a/Source/Core/DiscIO/Src/SConscript +++ b/Source/Core/DiscIO/Src/SConscript @@ -20,7 +20,7 @@ files = [ 'VolumeGC.cpp', 'VolumeWad.cpp', 'VolumeWiiCrypted.cpp', - 'FileMonitor.cpp', + 'FileMonitor.cpp', 'NANDContentLoader.cpp', 'WiiWad.cpp', 'AES/aes_cbc.c', @@ -30,4 +30,5 @@ files = [ libs = [ 'common' ] + env.StaticLibrary(env['local_libs'] + 'discio', files, LIBS = libs) diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index b8743e8820..5cafa52c17 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -4,8 +4,6 @@ Import('env') import os import sys -wxenv = env.Clone() - files = [ 'BootManager.cpp', ] @@ -15,14 +13,13 @@ libs = [ 'inputcommon', 'common', 'lua', 'z', 'sfml-network', ] -if wxenv['HAVE_WX']: +if env['HAVE_WX']: memcardfiles = [ 'MemcardManager.cpp', 'MemoryCards/GCMemcard.cpp', 'WxUtils.cpp', - ] + ] - files += memcardfiles files += [ 'AboutDolphin.cpp', 'ARCodeAddEdit.cpp', @@ -38,6 +35,7 @@ if wxenv['HAVE_WX']: 'ISOProperties.cpp', 'PatchAddEdit.cpp', 'CheatsWindow.cpp', + 'Main.cpp', 'MemoryCards/WiiSaveCrypted.cpp', 'NetPlay.cpp', 'NetPlayClient.cpp', @@ -45,28 +43,29 @@ if wxenv['HAVE_WX']: 'NetWindow.cpp', ] - libs = [ 'debwx', 'debugger_ui_util', 'inputuicommon'] + libs + wxlibs = [ 'debwx', 'debugger_ui_util', 'inputuicommon', 'memcard' ] else: files+= [ + 'MainNoGUI.cpp', 'cmdline.c', ] if sys.platform == 'win32': files += [ "stdafx.cpp" ] -elif sys.platform == 'darwin' and not wxenv['HAVE_WX']: +elif sys.platform == 'darwin' and not env['HAVE_WX']: files += [ 'cocoaApp.m' ] exeNoGUI = env['binary_dir'] + 'DolphinNoGUI' -elif sys.platform == 'darwin' and wxenv['HAVE_WX']: +elif sys.platform == 'darwin' and env['HAVE_WX']: exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin' - wxenv.Install(env['binary_dir'] + 'Dolphin.app/Contents/' + + env.Install(env['binary_dir'] + 'Dolphin.app/Contents/' + 'Library/Frameworks/Cg.framework', '#Externals/Cg/Cg.framework/Cg') - wxenv.Install(env['binary_dir'] + 'Dolphin.app/Contents/Resources/', + env.Install(env['binary_dir'] + 'Dolphin.app/Contents/Resources/', '#Source/Core/DolphinWX/resources/Dolphin.icns') - wxenv.Plist( + env.Plist( env['binary_dir'] + 'Dolphin.app/Contents/Info.plist', Value(dict( CFBundleExecutable = 'Dolphin', @@ -85,12 +84,8 @@ else: exeGUI = env['binary_dir'] + 'dolphin-emu' exeNoGUI = env['binary_dir'] + 'dolphin-emu-nogui' -wxenv.Append( - LIBS = libs - ) - -if wxenv['HAVE_WX']: - wxenv.Program(exeGUI, files + [ 'Main.cpp' ]) - wxenv.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles) +if env['HAVE_WX']: + env.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles) + env.Program(exeGUI, files, LIBS = env['LIBS'] + wxlibs + libs) else: - wxenv.Program(exeNoGUI, files + [ 'MainNoGUI.cpp' ]) + env.Program(exeNoGUI, files, LIBS = env['LIBS'] + libs) diff --git a/Source/Core/InputUICommon/Src/SConscript b/Source/Core/InputUICommon/Src/SConscript index b77178d7ce..f616c52ad7 100644 --- a/Source/Core/InputUICommon/Src/SConscript +++ b/Source/Core/InputUICommon/Src/SConscript @@ -1,7 +1,6 @@ # -*- python -*- Import('env') -import sys if not env['HAVE_WX']: Return() diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript index 1889111e43..4123efff89 100644 --- a/Source/Core/VideoCommon/Src/SConscript +++ b/Source/Core/VideoCommon/Src/SConscript @@ -39,8 +39,8 @@ files = [ ] if env['HAVE_OPENCL']: - files += [ - 'OpenCL/OCLTextureDecoder.cpp', - ] + files += [ + 'OpenCL/OCLTextureDecoder.cpp', + ] env.StaticLibrary(env['local_libs'] + "videocommon", files) diff --git a/Source/DSPTool/Src/SConscript b/Source/DSPTool/Src/SConscript index a2775ca4f0..bb128a89e0 100644 --- a/Source/DSPTool/Src/SConscript +++ b/Source/DSPTool/Src/SConscript @@ -1,19 +1,14 @@ # -*- python -*- Import('env') -import sys - -dtenv = env.Clone() files = [ - 'main.cpp', - ] + 'main.cpp', + ] libs = [ - 'dspcore', - 'common', -] + 'dspcore', + 'common', + ] -dtenv.Append(LIBS = libs) - -dtenv.Program(dtenv['binary_dir'] + 'dsptool', files) +env.Program(env['binary_dir'] + 'dsptool', files, LIBS = libs) diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript index 29a9ff5dd5..6d6b8c9439 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript @@ -1,7 +1,6 @@ # -*- python -*- Import('env') -import sys name = "Plugin_DSP_HLE" @@ -23,15 +22,11 @@ files = [ 'UCodes/UCode_Zelda_Synth.cpp', ] -dspenv = env.Clone() +if env['HAVE_WX']: + files += [ + 'ConfigDlg.cpp' + ] -if dspenv['HAVE_WX']: - files += [ - 'ConfigDlg.cpp', - ] +libs = [ 'common', 'audiocommon' ] -dspenv.Append( - LIBS = [ 'common', 'audiocommon' ], - ) - -dspenv.SharedLibrary(env['plugin_dir']+name, files) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript index 9856729edf..b459171486 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript @@ -1,8 +1,6 @@ - # -*- python -*- Import('env') -import sys name = "Plugin_DSP_LLE" @@ -17,21 +15,15 @@ files = [ ] if env['HAVE_WX']: - files += [ - "DSPConfigDlgLLE.cpp", - "Debugger/DSPDebugWindow.cpp", - "Debugger/DSPRegisterView.cpp", + files += [ + "DSPConfigDlgLLE.cpp", + "Debugger/DSPDebugWindow.cpp", + "Debugger/DSPRegisterView.cpp", ] -lleenv = env.Clone() +libs = [ 'dspcore', 'audiocommon', 'common' ] if env['HAVE_WX']: - lleenv.Append( - LIBS = [ 'dspcore', 'audiocommon', 'common', 'debugger_ui_util' ], - ) -else: - lleenv.Append( - LIBS = [ 'dspcore', 'audiocommon', 'common' ], - ) + libs += [ 'debugger_ui_util' ] -lleenv.SharedLibrary(env['plugin_dir']+name, files) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index 2362e61a98..1faf2d265c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -23,32 +23,19 @@ files = [ 'GLUtil.cpp' ] -libs = [ - 'videocommon', 'GLEW', 'SOIL', 'common' - ] +libs = [ 'videocommon', 'GLEW', 'SOIL', 'common' ] -gfxenv = env.Clone() - -if sys.platform != 'darwin': - if gfxenv['HAVE_OPENCL']: - libs += [ 'OpenCL'] - -if gfxenv['HAVE_WX']: +if env['HAVE_WX']: files += [ 'GUI/ConfigDlg.cpp', 'Debugger/Debugger.cpp', ] -if sys.platform == 'darwin' and not gfxenv['HAVE_WX']: +if sys.platform == 'darwin' and not env['HAVE_WX']: files += [ 'cocoaGL.m' ] - -if sys.platform == 'win32': +elif sys.platform == 'win32': files += [ 'OS/Win32.cpp' ] - libs += [ env['base_dir'] + '/Externals/Cg/' ] - gfxenv['CPPPATH'] += libs +elif not sys.platform == 'darwin' and env['HAVE_OPENCL']: + libs += [ 'OpenCL' ] -gfxenv.SharedLibrary( - env['plugin_dir']+name, - files, - LIBS = libs + gfxenv['LIBS'] - ) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript index 7ee899e44d..f633dfba27 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript @@ -33,22 +33,11 @@ files = [ 'XFMemLoader.cpp', ] -libs = [ - 'videocommon', 'GLEW', 'SOIL', 'common' - ] +libs = [ 'videocommon', 'GLEW', 'SOIL', 'common' ] -gfxenv = env.Clone() - -if sys.platform == 'darwin' and not gfxenv['HAVE_WX']: +if sys.platform == 'darwin' and not env['HAVE_WX']: files += [ 'cocoaGL.m' ] - -if sys.platform == 'win32': +elif sys.platform == 'win32': files += [ 'Win32.cpp' ] - libs += [ env['base_dir'] + '/Externals/Cg/' ] - gfxenv['CPPPATH'] += libs -gfxenv.SharedLibrary( - env['plugin_dir']+name, - files, - LIBS = libs + gfxenv['LIBS'] - ) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/Plugins/Plugin_Wiimote/Src/SConscript b/Source/Plugins/Plugin_Wiimote/Src/SConscript index 6a7bf23f1a..ab8754d4da 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/SConscript +++ b/Source/Plugins/Plugin_Wiimote/Src/SConscript @@ -1,9 +1,7 @@ -# -*- python -*- - -Import('env') -import sys +# -*- python -*- + +Import('env') -wmenv = env.Clone() name = "Plugin_Wiimote" files = [ @@ -22,25 +20,17 @@ files = [ libs = [ 'inputcommon', 'common', 'SDL' ] -if wmenv['HAVE_WX']: +if env['HAVE_WX']: libs = [ 'inputuicommon' ] + libs files += [ "ConfigBasicDlg.cpp", "ConfigPadDlg.cpp", "ConfigGamepad.cpp", "FillReport.cpp", - ] + ] -cxxflags = [ ] +if env['HAVE_WIIUSE']: + libs += [ 'wiiuse' ] + files += [ 'wiimote_real.cpp' ] -if wmenv['HAVE_WIIUSE']: - libs += [ 'wiiuse' ] - files += [ "wiimote_real.cpp" ] - cxxflags += ['-DHAVE_WIIUSE'] - -wmenv.Append( - CXXFLAGS = cxxflags, - LIBS = libs, - ) - -wmenv.SharedLibrary(env['plugin_dir']+name, files) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript index 76364134dc..5df8597e90 100644 --- a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript +++ b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript @@ -4,7 +4,6 @@ Import('env') import sys name = "Plugin_WiimoteNew" -wiinewenv = env.Clone() files = [ 'WiimoteEmu/WiimoteEmu.cpp', @@ -19,25 +18,17 @@ files = [ 'WiimoteNew.cpp' ] -cxxflags = [ ] - -libs = [ 'inputcommon', 'common'] +libs = [ 'inputcommon', 'common' ] if sys.platform == 'win32' or sys.platform == 'linux2': libs += [ 'SDL' ] -if wiinewenv['HAVE_WX']: +if env['HAVE_WX']: libs = [ 'inputuicommon' ] + libs files += [ 'WiimoteConfigDiag.cpp' ] -if wiinewenv['HAVE_WIIUSE']: - cxxflags += [ '-DHAVE_WIIUSE' ] +if env['HAVE_WIIUSE']: files += [ 'WiimoteReal/WiimoteReal.cpp' ] libs += [ 'wiiuse' ] -wiinewenv.Append( - CXXFLAGS = cxxflags, - LIBS = libs - ) - -wiinewenv.SharedLibrary(env['plugin_dir']+name, files) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/UnitTests/SConscript b/Source/UnitTests/SConscript index 22c20b1bda..4ab5982668 100644 --- a/Source/UnitTests/SConscript +++ b/Source/UnitTests/SConscript @@ -1,9 +1,6 @@ -# -*- python -*- +# -*- python -*- Import('env') -import sys - -unitenv = env.Clone() files = [ "AudioJitTests.cpp", @@ -13,7 +10,6 @@ files = [ libs = [ 'dspcore', 'common', -] + ] -unitenv.Append(LIBS = libs) -unitenv.Program(env['binary_dir'] + 'tester', files) +env.Program(env['binary_dir'] + 'tester', files, LIBS = libs)