piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of a number of unnecessary env.Clones.

Browse Source 
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
This commit is contained in:
Soren Jorvang 2010-07-19 03:42:37 +00:00
parent 4ecfa3b7a2
commit a2b1f829cb
29 changed files with 223 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/Bochs_disasm/SConscript vendored
View File

@ -1,4 +1,4 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys import sys

2
Externals/LZO/SConscript vendored
View File

@ -1,4 +1,4 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')

68
Externals/Lua/SConscript vendored
View File

@ -1,44 +1,44 @@
# -*- python -*- # -*- python -*-
import sys
Import('env') Import('env')
import sys
luaenv = env.Clone() luaenv = env.Clone()
if not sys.platform == 'win32': 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 = [ files = [
'lapi.c', 'lapi.c',
'lauxlib.c', 'lauxlib.c',
'lbaselib.c', 'lbaselib.c',
'lcode.c', 'lcode.c',
'ldblib.c', 'ldblib.c',
'ldebug.c', 'ldebug.c',
'ldo.c', 'ldo.c',
'ldump.c', 'ldump.c',
'lfunc.c', 'lfunc.c',
'lgc.c', 'lgc.c',
'linit.c', 'linit.c',
'liolib.c', 'liolib.c',
'llex.c', 'llex.c',
'lmathlib.c', 'lmathlib.c',
'lmem.c', 'lmem.c',
'loadlib.c', 'loadlib.c',
'lobject.c', 'lobject.c',
'lopcodes.c', 'lopcodes.c',
'loslib.c', 'loslib.c',
'lparser.c', 'lparser.c',
'lstate.c', 'lstate.c',
'lstring.c', 'lstring.c',
'lstrlib.c', 'lstrlib.c',
'ltable.c', 'ltable.c',
'ltablib.c', 'ltablib.c',
'ltm.c', 'ltm.c',
'lundump.c', 'lundump.c',
'lvm.c', 'lvm.c',
'lzio.c', 'lzio.c',
'print.c', 'print.c',
] ]
luaenv.StaticLibrary(env['local_libs'] + "lua", files) luaenv.StaticLibrary(env['local_libs'] + "lua", files)

19
Externals/MemcardManager/SConscript vendored
View File

@ -1,14 +1,13 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys
if not env['HAVE_WX']: if not env['HAVE_WX']:
Return() Return()
wxenv = env.Clone()
files = [ files = [
'src/mcmMain.cpp',
'src/MCMdebug.cpp',
] ]
libs = [ libs = [
@ -16,18 +15,6 @@ libs = [
'common', 'common',
] ]
if wxenv['HAVE_WX']:
files += [
'src/mcmMain.cpp',
'src/MCMdebug.cpp',
]
LIBS = libs
wxenv.Append(
LIBS = libs
)
exeGUI = env['binary_dir'] + 'MemcardManager' exeGUI = env['binary_dir'] + 'MemcardManager'
wxenv.Program(exeGUI, files) env.Program(exeGUI, files, LIBS = env['LIBS'] + libs)

45
Externals/SDL/SConscript vendored
View File

@ -1,54 +1,13 @@
# -*- python -*- # -*- python -*-
import sys
Import('env') Import('env')
import sys
files = [ files = [
'src/SDL.c', 'src/SDL.c',
'src/SDL_error.c', 'src/SDL_error.c',
'src/SDL_fatal.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/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': if sys.platform == 'darwin':

5
Externals/SFML/src/SConscript vendored
View File

@ -1,9 +1,8 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys
files = [ files = [
"SFML/Network/Ftp.cpp", "SFML/Network/Ftp.cpp",
"SFML/Network/Http.cpp", "SFML/Network/Http.cpp",
"SFML/Network/IPAddress.cpp", "SFML/Network/IPAddress.cpp",

2
Externals/SOIL/SConscript vendored
View File

@ -1,6 +1,6 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys
files = [ files = [
'image_DXT.c', 'image_DXT.c',

42
Externals/WiiUseSrc/Src/SConscript vendored
View File

@ -1,24 +1,28 @@
# -*- python -*- # -*- python -*-
import sys
Import('env') Import('env')
import sys
if (sys.platform == 'linux2' and env['HAVE_BLUEZ'] != 1): if (sys.platform == 'linux2' and not env['HAVE_BLUEZ']) or \
env['HAVE_WIIUSE'] = 0 (not sys.platform == 'darwin' and
Return() not sys.platform == 'linux2' and
not sys.platform == 'win32'):
files = [ env['HAVE_WIIUSE'] = 0
"io.c", Return()
"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)
env['HAVE_WIIUSE'] = 1 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)

2
Externals/zlib/SConscript vendored
View File

@ -1,4 +1,4 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')

54
SConstruct
View File

@ -34,24 +34,22 @@ cppDefines = [
'GCC_HASCLASSVISIBILITY', 'GCC_HASCLASSVISIBILITY',
] ]
basedir = os.getcwd() + '/'
include_paths = [ include_paths = [
basedir + 'Source/Core/Common/Src', '#Source/Core/Common/Src',
basedir + 'Source/Core/DiscIO/Src', '#Source/Core/DiscIO/Src',
basedir + 'Source/PluginSpecs', '#Source/PluginSpecs',
basedir + 'Source/Core/Core/Src', '#Source/Core/Core/Src',
basedir + 'Source/Core/DebuggerWX/Src', '#Source/Core/DebuggerWX/Src',
basedir + 'Externals/Bochs_disasm', '#Externals/Bochs_disasm',
basedir + 'Externals/Lua', '#Externals/Lua',
basedir + 'Externals/WiiUseSrc/Src', '#Externals/WiiUseSrc/Src',
basedir + 'Source/Core/VideoCommon/Src', '#Source/Core/VideoCommon/Src',
basedir + 'Source/Core/InputCommon/Src', '#Source/Core/InputCommon/Src',
basedir + 'Source/Core/InputUICommon/Src', '#Source/Core/InputUICommon/Src',
basedir + 'Source/Core/AudioCommon/Src', '#Source/Core/AudioCommon/Src',
basedir + 'Source/Core/DebuggerUICommon/Src', '#Source/Core/DebuggerUICommon/Src',
basedir + 'Source/Core/DolphinWX/Src', '#Source/Core/DolphinWX/Src',
basedir + 'Source/Core/DSPCore/Src', '#Source/Core/DSPCore/Src',
] ]
dirs = [ dirs = [
@ -80,7 +78,6 @@ dirs = [
'Source/UnitTests', 'Source/UnitTests',
] ]
builders = {} builders = {}
if sys.platform == 'darwin': if sys.platform == 'darwin':
from plistlib import writePlist from plistlib import writePlist
@ -214,15 +211,12 @@ tests = {'CheckWXConfig' : wxconfig.CheckWXConfig,
} }
# Object files # 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) platform.system() + '-' + platform.machine() + '-' + env['flavor'] + os.sep)
# Static libs go here # Static libs go here
env['local_libs'] = env['build_dir'] + os.sep + 'libs' + os.sep env['local_libs'] = env['build_dir'] + os.sep + 'libs' + os.sep
# Where do we run from
env['base_dir'] = os.getcwd()+ '/'
# Install paths # Install paths
extra='' extra=''
if flavour == 'debug': if flavour == 'debug':
@ -237,7 +231,7 @@ if sys.platform == 'linux2' and env['install'] == 'global':
env['plugin_dir'] = env['prefix'] + 'lib/dolphin-emu/' env['plugin_dir'] = env['prefix'] + 'lib/dolphin-emu/'
env['data_dir'] = env['prefix'] + "share/dolphin-emu/" env['data_dir'] = env['prefix'] + "share/dolphin-emu/"
else: else:
env['prefix'] = os.path.join(env['base_dir'] + 'Binary', env['prefix'] = os.path.join('#Binary',
platform.system() + '-' + platform.machine() + extra + os.sep) platform.system() + '-' + platform.machine() + extra + os.sep)
env['binary_dir'] = env['prefix'] env['binary_dir'] = env['prefix']
env['plugin_dir'] = env['prefix'] + 'plugins/' 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']) env['LIBPATH'].insert(0, env['local_libs'])
if not shared['glew']: if not shared['glew']:
env['CPPPATH'] += [basedir + 'Externals/GLew/include'] env['CPPPATH'] += ['#Externals/GLew/include']
dirs += ['Externals/GLew'] dirs += ['Externals/GLew']
if not shared['lzo']: if not shared['lzo']:
env['CPPPATH'] += [basedir + 'Externals/LZO'] env['CPPPATH'] += ['#Externals/LZO']
dirs += ['Externals/LZO'] dirs += ['Externals/LZO']
if not shared['sdl']: if not shared['sdl']:
env['CPPPATH'] += [basedir + 'Externals/SDL'] env['CPPPATH'] += ['#Externals/SDL']
env['CPPPATH'] += [basedir + 'Externals/SDL/include'] env['CPPPATH'] += ['#Externals/SDL/include']
dirs += ['Externals/SDL'] dirs += ['Externals/SDL']
if not shared['soil']: if not shared['soil']:
env['CPPPATH'] += [basedir + 'Externals/SOIL'] env['CPPPATH'] += ['#Externals/SOIL']
dirs += ['Externals/SOIL'] dirs += ['Externals/SOIL']
if not shared['sfml']: if not shared['sfml']:
env['CPPPATH'] += [basedir + 'Externals/SFML/include'] env['CPPPATH'] += ['#Externals/SFML/include']
dirs += ['Externals/SFML/src'] dirs += ['Externals/SFML/src']
if not shared['zlib']: if not shared['zlib']:
env['CPPPATH'] += [basedir + 'Externals/zlib'] env['CPPPATH'] += ['#Externals/zlib']
dirs += ['Externals/zlib'] dirs += ['Externals/zlib']
rev = utils.GenerateRevFile(env['flavor'], rev = utils.GenerateRevFile(env['flavor'],

35
Source/Core/AudioCommon/Src/SConscript
View File

@ -4,25 +4,24 @@ Import('env')
import sys import sys
files = [ files = [
'AudioCommonConfig.cpp', 'AudioCommonConfig.cpp',
'WaveFile.cpp', 'WaveFile.cpp',
'Mixer.cpp', 'Mixer.cpp',
'AudioCommon.cpp', 'AudioCommon.cpp',
] ]
if sys.platform == 'win32':
files += [ 'DSoundStream.cpp' ]
if sys.platform == 'darwin': if sys.platform == 'darwin':
files += [ 'CoreAudioSoundStream.cpp' ] files += [ 'CoreAudioSoundStream.cpp' ]
else: else:
if env['HAVE_ALSA']: if env['HAVE_ALSA']:
files += [ 'AlsaSoundStream.cpp' ] files += [ 'AlsaSoundStream.cpp' ]
if env['HAVE_AO']: if env['HAVE_AO']:
files += [ 'AOSoundStream.cpp' ] files += [ 'AOSoundStream.cpp' ]
if env['HAVE_OPENAL'] or sys.platform == 'win32': if env['HAVE_OPENAL'] or sys.platform == 'win32':
files += [ 'OpenALStream.cpp', 'aldlist.cpp' ] files += [ 'OpenALStream.cpp', 'aldlist.cpp' ]
if env['HAVE_PULSEAUDIO']: if env['HAVE_PULSEAUDIO']:
files += [ 'PulseAudioStream.cpp' ] files += [ 'PulseAudioStream.cpp' ]
if sys.platform == 'win32':
files += [ 'DSoundStream.cpp' ]
env.StaticLibrary(env['local_libs'] + 'audiocommon', files) env.StaticLibrary(env['local_libs'] + 'audiocommon', files)

5
Source/Core/Common/Src/Common.h
View File

@ -57,6 +57,7 @@ extern const char *netplay_dolphin_ver;
#undef STACKALIGN #undef STACKALIGN
#define STACKALIGN __attribute__((__force_align_arg_pointer__)) #define STACKALIGN __attribute__((__force_align_arg_pointer__))
#endif #endif
#define HAVE_WIIUSE 1
// We use wxWidgets on OS X only if it is version 2.9+ with Cocoa support. // We use wxWidgets on OS X only if it is version 2.9+ with Cocoa support.
#ifdef __WXOSX_COCOA__ #ifdef __WXOSX_COCOA__
#define HAVE_WX 1 #define HAVE_WX 1
@ -114,6 +115,10 @@ extern const char *netplay_dolphin_ver;
#include "Config.h" // SCons autoconfiguration defines #include "Config.h" // SCons autoconfiguration defines
#endif #endif
#if defined __linux__ && HAVE_BLUEZ
#define HAVE_WIIUSE 1
#endif
// Windows compatibility // Windows compatibility
#ifndef _WIN32 #ifndef _WIN32
#include <limits.h> #include <limits.h>

1
Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
View File

@ -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 // a == 0, which for these instructions imply value = 0
gpr.SetImmediate32(d, value); gpr.SetImmediate32(d, value);
// XXX soren
gpr.StoreFromX64(d); gpr.StoreFromX64(d);
} }
else else

9
Source/Core/Core/Src/SConscript
View File

@ -126,16 +126,15 @@ files = [
if sys.platform == 'win32': if sys.platform == 'win32':
files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp" ] files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp" ]
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
files += [ "HW/BBA-TAP/TAP_Apple.cpp"] files += [ "HW/BBA-TAP/TAP_Apple.cpp" ]
else: else:
files += [ "HW/BBA-TAP/TAP_Unix.cpp"] files += [ "HW/BBA-TAP/TAP_Unix.cpp" ]
libs = [ libs = [
'bdisasm', 'bdisasm',
'inputcommon', 'inputcommon',
'lua', 'lua',
'sfml-network' 'sfml-network',
] ]
env_core = env.Clone(); env.StaticLibrary(env['local_libs'] + 'core', files, LIBS = libs)
env_core.StaticLibrary(env['local_libs'] + 'core', files, LIBS=libs)

48
Source/Core/DSPCore/Src/SConscript
View File

@ -3,29 +3,29 @@
Import('env') Import('env')
files = [ files = [
"assemble.cpp", "assemble.cpp",
"disassemble.cpp", "disassemble.cpp",
"DSPAccelerator.cpp", "DSPAccelerator.cpp",
"DSPIntCCUtil.cpp", "DSPIntCCUtil.cpp",
"DSPIntExtOps.cpp", "DSPIntExtOps.cpp",
"DSPHWInterface.cpp", "DSPHWInterface.cpp",
"DSPMemoryMap.cpp", "DSPMemoryMap.cpp",
"DSPStacks.cpp", "DSPStacks.cpp",
"DSPAnalyzer.cpp", "DSPAnalyzer.cpp",
"DspIntArithmetic.cpp", "DspIntArithmetic.cpp",
"DspIntBranch.cpp", "DspIntBranch.cpp",
"DspIntLoadStore.cpp", "DspIntLoadStore.cpp",
"DspIntMisc.cpp", "DspIntMisc.cpp",
"DspIntMultiplier.cpp", "DspIntMultiplier.cpp",
"DSPEmitter.cpp", "DSPEmitter.cpp",
"DSPCodeUtil.cpp", "DSPCodeUtil.cpp",
"LabelMap.cpp", "LabelMap.cpp",
"DSPInterpreter.cpp", "DSPInterpreter.cpp",
"DSPCore.cpp", "DSPCore.cpp",
"DSPTables.cpp", "DSPTables.cpp",
"Jit/DSPJitExtOps.cpp", "Jit/DSPJitExtOps.cpp",
"Jit/DSPJitUtil.cpp", "Jit/DSPJitUtil.cpp",
"Jit/DSPJitMisc.cpp", "Jit/DSPJitMisc.cpp",
] ]
env.StaticLibrary(env['local_libs'] + 'dspcore', files) env.StaticLibrary(env['local_libs'] + 'dspcore', files)

1
Source/Core/DebuggerUICommon/Src/SConscript
View File

@ -1,7 +1,6 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys
if not env['HAVE_WX']: if not env['HAVE_WX']:
Return() Return()

30
Source/Core/DebuggerWX/Src/SConscript
View File

@ -3,24 +3,24 @@
Import('env') Import('env')
if not env['HAVE_WX']: if not env['HAVE_WX']:
Return() Return()
files = [ files = [
"BreakpointDlg.cpp", "BreakpointDlg.cpp",
"BreakpointView.cpp", "BreakpointView.cpp",
"BreakpointWindow.cpp", "BreakpointWindow.cpp",
"CodeWindow.cpp", "CodeWindow.cpp",
"CodeWindowFunctions.cpp", "CodeWindowFunctions.cpp",
"MemoryCheckDlg.cpp", "MemoryCheckDlg.cpp",
"MemoryWindow.cpp", "MemoryWindow.cpp",
"RegisterWindow.cpp", "RegisterWindow.cpp",
"RegisterView.cpp", "RegisterView.cpp",
"JitWindow.cpp", "JitWindow.cpp",
] ]
libs = [ libs = [
'common', 'common',
'debugger_ui_util' 'debugger_ui_util'
] ]
env.StaticLibrary(env['local_libs'] + "debwx", files, LIBS = libs) env.StaticLibrary(env['local_libs'] + "debwx", files, LIBS = libs)

3
Source/Core/DiscIO/Src/SConscript
View File

@ -20,7 +20,7 @@ files = [
'VolumeGC.cpp', 'VolumeGC.cpp',
'VolumeWad.cpp', 'VolumeWad.cpp',
'VolumeWiiCrypted.cpp', 'VolumeWiiCrypted.cpp',
'FileMonitor.cpp', 'FileMonitor.cpp',
'NANDContentLoader.cpp', 'NANDContentLoader.cpp',
'WiiWad.cpp', 'WiiWad.cpp',
'AES/aes_cbc.c', 'AES/aes_cbc.c',
@ -30,4 +30,5 @@ files = [
libs = [ libs = [
'common' 'common'
] ]
env.StaticLibrary(env['local_libs'] + 'discio', files, LIBS = libs) env.StaticLibrary(env['local_libs'] + 'discio', files, LIBS = libs)

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

@ -4,8 +4,6 @@ Import('env')
import os import os
import sys import sys
wxenv = env.Clone()
files = [ files = [
'BootManager.cpp', 'BootManager.cpp',
] ]
@ -15,14 +13,13 @@ libs = [
'inputcommon', 'common', 'lua', 'z', 'sfml-network', 'inputcommon', 'common', 'lua', 'z', 'sfml-network',
] ]
if wxenv['HAVE_WX']: if env['HAVE_WX']:
memcardfiles = [ memcardfiles = [
'MemcardManager.cpp', 'MemcardManager.cpp',
'MemoryCards/GCMemcard.cpp', 'MemoryCards/GCMemcard.cpp',
'WxUtils.cpp', 'WxUtils.cpp',
] ]
files += memcardfiles
files += [ files += [
'AboutDolphin.cpp', 'AboutDolphin.cpp',
'ARCodeAddEdit.cpp', 'ARCodeAddEdit.cpp',
@ -38,6 +35,7 @@ if wxenv['HAVE_WX']:
'ISOProperties.cpp', 'ISOProperties.cpp',
'PatchAddEdit.cpp', 'PatchAddEdit.cpp',
'CheatsWindow.cpp', 'CheatsWindow.cpp',
'Main.cpp',
'MemoryCards/WiiSaveCrypted.cpp', 'MemoryCards/WiiSaveCrypted.cpp',
'NetPlay.cpp', 'NetPlay.cpp',
'NetPlayClient.cpp', 'NetPlayClient.cpp',
@ -45,28 +43,29 @@ if wxenv['HAVE_WX']:
'NetWindow.cpp', 'NetWindow.cpp',
] ]
libs = [ 'debwx', 'debugger_ui_util', 'inputuicommon'] + libs wxlibs = [ 'debwx', 'debugger_ui_util', 'inputuicommon', 'memcard' ]
else: else:
files+= [ files+= [
'MainNoGUI.cpp',
'cmdline.c', 'cmdline.c',
] ]
if sys.platform == 'win32': if sys.platform == 'win32':
files += [ "stdafx.cpp" ] files += [ "stdafx.cpp" ]
elif sys.platform == 'darwin' and not wxenv['HAVE_WX']: elif sys.platform == 'darwin' and not env['HAVE_WX']:
files += [ 'cocoaApp.m' ] files += [ 'cocoaApp.m' ]
exeNoGUI = env['binary_dir'] + 'DolphinNoGUI' 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' 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', 'Library/Frameworks/Cg.framework',
'#Externals/Cg/Cg.framework/Cg') '#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') '#Source/Core/DolphinWX/resources/Dolphin.icns')
wxenv.Plist( env.Plist(
env['binary_dir'] + 'Dolphin.app/Contents/Info.plist', env['binary_dir'] + 'Dolphin.app/Contents/Info.plist',
Value(dict( Value(dict(
CFBundleExecutable = 'Dolphin', CFBundleExecutable = 'Dolphin',
@ -85,12 +84,8 @@ else:
exeGUI = env['binary_dir'] + 'dolphin-emu' exeGUI = env['binary_dir'] + 'dolphin-emu'
exeNoGUI = env['binary_dir'] + 'dolphin-emu-nogui' exeNoGUI = env['binary_dir'] + 'dolphin-emu-nogui'
wxenv.Append( if env['HAVE_WX']:
LIBS = libs env.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles)
) env.Program(exeGUI, files, LIBS = env['LIBS'] + wxlibs + libs)
if wxenv['HAVE_WX']:
wxenv.Program(exeGUI, files + [ 'Main.cpp' ])
wxenv.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles)
else: else:
wxenv.Program(exeNoGUI, files + [ 'MainNoGUI.cpp' ]) env.Program(exeNoGUI, files, LIBS = env['LIBS'] + libs)

1
Source/Core/InputUICommon/Src/SConscript
View File

@ -1,7 +1,6 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys
if not env['HAVE_WX']: if not env['HAVE_WX']:
Return() Return()

6
Source/Core/VideoCommon/Src/SConscript
View File

@ -39,8 +39,8 @@ files = [
] ]
if env['HAVE_OPENCL']: if env['HAVE_OPENCL']:
files += [ files += [
'OpenCL/OCLTextureDecoder.cpp', 'OpenCL/OCLTextureDecoder.cpp',
] ]
env.StaticLibrary(env['local_libs'] + "videocommon", files) env.StaticLibrary(env['local_libs'] + "videocommon", files)

17
Source/DSPTool/Src/SConscript
View File

@ -1,19 +1,14 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys
dtenv = env.Clone()
files = [ files = [
'main.cpp', 'main.cpp',
] ]
libs = [ libs = [
'dspcore', 'dspcore',
'common', 'common',
] ]
dtenv.Append(LIBS = libs) env.Program(env['binary_dir'] + 'dsptool', files, LIBS = libs)
dtenv.Program(dtenv['binary_dir'] + 'dsptool', files)

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

@ -1,7 +1,6 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys
name = "Plugin_DSP_HLE" name = "Plugin_DSP_HLE"
@ -23,15 +22,11 @@ files = [
'UCodes/UCode_Zelda_Synth.cpp', 'UCodes/UCode_Zelda_Synth.cpp',
] ]
dspenv = env.Clone() if env['HAVE_WX']:
files += [
'ConfigDlg.cpp'
]
if dspenv['HAVE_WX']: libs = [ 'common', 'audiocommon' ]
files += [
'ConfigDlg.cpp',
]
dspenv.Append( env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)
LIBS = [ 'common', 'audiocommon' ],
)
dspenv.SharedLibrary(env['plugin_dir']+name, files)

22
Source/Plugins/Plugin_DSP_LLE/Src/SConscript
View File

@ -1,8 +1,6 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys
name = "Plugin_DSP_LLE" name = "Plugin_DSP_LLE"
@ -17,21 +15,15 @@ files = [
] ]
if env['HAVE_WX']: if env['HAVE_WX']:
files += [ files += [
"DSPConfigDlgLLE.cpp", "DSPConfigDlgLLE.cpp",
"Debugger/DSPDebugWindow.cpp", "Debugger/DSPDebugWindow.cpp",
"Debugger/DSPRegisterView.cpp", "Debugger/DSPRegisterView.cpp",
] ]
lleenv = env.Clone() libs = [ 'dspcore', 'audiocommon', 'common' ]
if env['HAVE_WX']: if env['HAVE_WX']:
lleenv.Append( libs += [ 'debugger_ui_util' ]
LIBS = [ 'dspcore', 'audiocommon', 'common', 'debugger_ui_util' ],
)
else:
lleenv.Append(
LIBS = [ 'dspcore', 'audiocommon', 'common' ],
)
lleenv.SharedLibrary(env['plugin_dir']+name, files) env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)

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

@ -23,32 +23,19 @@ files = [
'GLUtil.cpp' 'GLUtil.cpp'
] ]
libs = [ libs = [ 'videocommon', 'GLEW', 'SOIL', 'common' ]
'videocommon', 'GLEW', 'SOIL', 'common'
]
gfxenv = env.Clone() if env['HAVE_WX']:
if sys.platform != 'darwin':
if gfxenv['HAVE_OPENCL']:
libs += [ 'OpenCL']
if gfxenv['HAVE_WX']:
files += [ files += [
'GUI/ConfigDlg.cpp', 'GUI/ConfigDlg.cpp',
'Debugger/Debugger.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' ] files += [ 'cocoaGL.m' ]
elif sys.platform == 'win32':
if sys.platform == 'win32':
files += [ 'OS/Win32.cpp' ] files += [ 'OS/Win32.cpp' ]
libs += [ env['base_dir'] + '/Externals/Cg/' ] elif not sys.platform == 'darwin' and env['HAVE_OPENCL']:
gfxenv['CPPPATH'] += libs libs += [ 'OpenCL' ]
gfxenv.SharedLibrary( env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)
env['plugin_dir']+name,
files,
LIBS = libs + gfxenv['LIBS']
)

19
Source/Plugins/Plugin_VideoSoftware/Src/SConscript
View File

@ -33,22 +33,11 @@ files = [
'XFMemLoader.cpp', 'XFMemLoader.cpp',
] ]
libs = [ libs = [ 'videocommon', 'GLEW', 'SOIL', 'common' ]
'videocommon', 'GLEW', 'SOIL', 'common'
]
gfxenv = env.Clone() if sys.platform == 'darwin' and not env['HAVE_WX']:
if sys.platform == 'darwin' and not gfxenv['HAVE_WX']:
files += [ 'cocoaGL.m' ] files += [ 'cocoaGL.m' ]
elif sys.platform == 'win32':
if sys.platform == 'win32':
files += [ 'Win32.cpp' ] files += [ 'Win32.cpp' ]
libs += [ env['base_dir'] + '/Externals/Cg/' ]
gfxenv['CPPPATH'] += libs
gfxenv.SharedLibrary( env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)
env['plugin_dir']+name,
files,
LIBS = libs + gfxenv['LIBS']
)

28
Source/Plugins/Plugin_Wiimote/Src/SConscript
View File

@ -1,9 +1,7 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys
wmenv = env.Clone()
name = "Plugin_Wiimote" name = "Plugin_Wiimote"
files = [ files = [
@ -22,25 +20,17 @@ files = [
libs = [ 'inputcommon', 'common', 'SDL' ] libs = [ 'inputcommon', 'common', 'SDL' ]
if wmenv['HAVE_WX']: if env['HAVE_WX']:
libs = [ 'inputuicommon' ] + libs libs = [ 'inputuicommon' ] + libs
files += [ files += [
"ConfigBasicDlg.cpp", "ConfigBasicDlg.cpp",
"ConfigPadDlg.cpp", "ConfigPadDlg.cpp",
"ConfigGamepad.cpp", "ConfigGamepad.cpp",
"FillReport.cpp", "FillReport.cpp",
] ]
cxxflags = [ ] if env['HAVE_WIIUSE']:
libs += [ 'wiiuse' ]
files += [ 'wiimote_real.cpp' ]
if wmenv['HAVE_WIIUSE']: env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)
libs += [ 'wiiuse' ]
files += [ "wiimote_real.cpp" ]
cxxflags += ['-DHAVE_WIIUSE']
wmenv.Append(
CXXFLAGS = cxxflags,
LIBS = libs,
)
wmenv.SharedLibrary(env['plugin_dir']+name, files)

17
Source/Plugins/Plugin_WiimoteNew/Src/SConscript
View File

@ -4,7 +4,6 @@ Import('env')
import sys import sys
name = "Plugin_WiimoteNew" name = "Plugin_WiimoteNew"
wiinewenv = env.Clone()
files = [ files = [
'WiimoteEmu/WiimoteEmu.cpp', 'WiimoteEmu/WiimoteEmu.cpp',
@ -19,25 +18,17 @@ files = [
'WiimoteNew.cpp' 'WiimoteNew.cpp'
] ]
cxxflags = [ ] libs = [ 'inputcommon', 'common' ]
libs = [ 'inputcommon', 'common']
if sys.platform == 'win32' or sys.platform == 'linux2': if sys.platform == 'win32' or sys.platform == 'linux2':
libs += [ 'SDL' ] libs += [ 'SDL' ]
if wiinewenv['HAVE_WX']: if env['HAVE_WX']:
libs = [ 'inputuicommon' ] + libs libs = [ 'inputuicommon' ] + libs
files += [ 'WiimoteConfigDiag.cpp' ] files += [ 'WiimoteConfigDiag.cpp' ]
if wiinewenv['HAVE_WIIUSE']: if env['HAVE_WIIUSE']:
cxxflags += [ '-DHAVE_WIIUSE' ]
files += [ 'WiimoteReal/WiimoteReal.cpp' ] files += [ 'WiimoteReal/WiimoteReal.cpp' ]
libs += [ 'wiiuse' ] libs += [ 'wiiuse' ]
wiinewenv.Append( env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)
CXXFLAGS = cxxflags,
LIBS = libs
)
wiinewenv.SharedLibrary(env['plugin_dir']+name, files)

10
Source/UnitTests/SConscript
View File

@ -1,9 +1,6 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys
unitenv = env.Clone()
files = [ files = [
"AudioJitTests.cpp", "AudioJitTests.cpp",
@ -13,7 +10,6 @@ files = [
libs = [ libs = [
'dspcore', 'common', 'dspcore', 'common',
] ]
unitenv.Append(LIBS = libs) env.Program(env['binary_dir'] + 'tester', files, LIBS = libs)
unitenv.Program(env['binary_dir'] + 'tester', files)