From 0284a7a1dfed25476d044c341d6372403a99b336 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Fri, 9 Jul 2010 01:26:53 +0000 Subject: [PATCH] Some more attempts at cleaning up the scons build and more clearly identifying which options and parameters go with which platforms etc. OS X, like Windows, now no longer uses Config.h. Configure() is still used for the wx-config parameters, but that is a temporary measure. Globals.cpp has never been used. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5860 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/Lua/luaconf.h | 5 - SConstruct | 207 +++++++-------- Source/Core/AudioCommon/Src/SConscript | 13 +- Source/Core/Common/Src/Common.h | 9 +- Source/Core/Core/Src/SConscript | 244 +++++++++--------- Source/Core/DolphinWX/DolphinWX.vcproj | 4 - Source/Core/DolphinWX/Src/Globals.cpp | 18 -- Source/Core/DolphinWX/Src/SConscript | 6 +- Source/Core/InputCommon/Src/SConscript | 5 +- Source/PluginSpecs/pluginspecs_wiimote.h | 2 +- Source/Plugins/Plugin_VideoOGL/Src/SConscript | 5 - .../Plugin_VideoSoftware/Src/SConscript | 5 - 12 files changed, 241 insertions(+), 282 deletions(-) delete mode 100644 Source/Core/DolphinWX/Src/Globals.cpp diff --git a/Externals/Lua/luaconf.h b/Externals/Lua/luaconf.h index cb0d8db695..ad395cec8b 100644 --- a/Externals/Lua/luaconf.h +++ b/Externals/Lua/luaconf.h @@ -10,11 +10,6 @@ #include #include -// can't include Common.h because it's C++ -// the following is OK because on Windows, Lua needs nothing special -#ifndef _WIN32 -#include "../../Source/Core/Common/Src/Config.h" -#endif /* ** ================================================================== diff --git a/SConstruct b/SConstruct index 6fc14154f9..8ba452b7ec 100644 --- a/SConstruct +++ b/SConstruct @@ -95,25 +95,20 @@ if sys.platform == 'darwin': vars = Variables('args.cache') vars.AddVariables( - BoolVariable('verbose', 'Set for compilation line', False), - BoolVariable('bundle', 'Set to create bundle', False), + BoolVariable('verbose', 'Set to show compilation lines', False), + BoolVariable('bundle', 'Set to create distribution bundle', False), BoolVariable('lint', 'Set for lint build (extra warnings)', False), - BoolVariable('nojit', 'Remove entire jit cores', False), BoolVariable('nowx', 'Set for building with no WX libs', False), EnumVariable('flavor', 'Choose a build flavor', 'release', allowed_values = ('release','devel','debug','fastlog','prof'), ignorecase = 2), - PathVariable('wxconfig', 'Path to the wxconfig', None), - EnumVariable('pgo', 'Profile-Guided Optimization (generate or use)', 'none', - allowed_values = ('none', 'generate', 'use'), - ignorecase = 2), - ('CC', 'The c compiler', 'gcc'), - ('CXX', 'The c++ compiler', 'g++'), + PathVariable('wxconfig', 'Path to wxconfig', None), + ('CC', 'The C compiler', 'gcc'), + ('CXX', 'The C++ compiler', 'g++'), ) if not sys.platform == 'win32' and not sys.platform == 'darwin': vars.AddVariables( - BoolVariable('wxgl', 'Set for building with WX GL', False), PathVariable('destdir', 'Temporary install location (for package building)', None, PathVariable.PathAccept), @@ -127,6 +122,9 @@ if not sys.platform == 'win32' and not sys.platform == 'darwin': 'Set the name of the user data directory in home', '.dolphin-emu', PathVariable.PathAccept), BoolVariable('opencl', 'Build with OpenCL', False), + EnumVariable('pgo', 'Profile-Guided Optimization (generate or use)', + 'none', allowed_values = ('none', 'generate', 'use'), + ignorecase = 2), BoolVariable('shared_glew', 'Use system shared libGLEW', True), BoolVariable('shared_lzo', 'Use system shared liblzo2', True), BoolVariable('shared_sdl', 'Use system shared libSDL', True), @@ -206,14 +204,7 @@ env['CCFLAGS'] = compileFlags env['CPPDEFINES'] = cppDefines if not sys.platform == 'win32': env['CXXFLAGS'] = ['-fvisibility-inlines-hidden'] - -# PGO - Profile Guided Optimization -if env['pgo']=='generate': - compileFlags.append('-fprofile-generate') - env['LINKFLAGS']='-fprofile-generate' -if env['pgo']=='use': - compileFlags.append('-fprofile-use') - env['LINKFLAGS']='-fprofile-use' + cppDefines.append('LUA_USE_LINUX') # Configuration tests section tests = {'CheckWXConfig' : wxconfig.CheckWXConfig, @@ -256,37 +247,57 @@ if sys.platform == 'darwin': env['plugin_dir'] = env['prefix'] + 'Dolphin.app/Contents/PlugIns/' env['data_dir'] = env['prefix'] + 'Dolphin.app/Contents/' -conf = env.Configure(custom_tests = tests, - config_h="Source/Core/Common/Src/Config.h") - +shared = {} +shared['glew'] = shared['lzo'] = shared['sdl'] = \ +shared['soil'] = shared['sfml'] = shared['zlib'] = 0 +wxmods = ['aui', 'adv', 'core', 'base', 'gl'] env['HAVE_OPENCL'] = 0 +env['HAVE_WX'] = 0 # OS X specifics if sys.platform == 'darwin': - compileFlags += ['-mmacosx-version-min=10.5'] - conf.Define('MAP_32BIT', 0) + compileFlags.append('-mmacosx-version-min=10.5') + cppDefines.append('MAP_32BIT=0') + if not env['nowx']: + cppDefines.append('HAVE_WX=1') + conf = env.Configure(custom_tests = tests) + # wxWidgets 2.9 has Cocoa support + env['HAVE_WX'] = conf.CheckWXConfig(2.9, wxmods, 0) + wxconfig.ParseWXConfig(env) + # Make sure that the libraries claimed by wx-config are valid + if not conf.CheckLib('wx_baseu-2.9'): + print "WX libraries not found - see config.log" + Exit(1) + conf.Finish() + # wx-config wants us to link with the OS X QuickTime framework + # which is not available for x86_64 and we don't use it anyway. + # Strip it out to silence some harmless linker warnings. + if env['FRAMEWORKS'].count('QuickTime'): + env['FRAMEWORKS'].remove('QuickTime') env['CC'] = "gcc-4.2" env['CFLAGS'] = ['-x', 'objective-c'] env['CXX'] = "g++-4.2" env['CXXFLAGS'] = ['-x', 'objective-c++'] - env['CCFLAGS'] += ['-arch' , 'x86_64' , '-arch' , 'i386'] + env['CCFLAGS'] += ['-arch', 'x86_64', '-arch', 'i386'] env['LIBS'] += ['iconv'] - env['LINKFLAGS'] += ['-arch', 'x86_64' , '-arch' , 'i386'] - env['FRAMEWORKS'] += ['CoreFoundation', 'CoreServices'] + env['LINKFLAGS'] += ['-arch', 'x86_64', '-arch', 'i386'] + env['FRAMEWORKS'] += ['AppKit', 'CoreFoundation', 'CoreServices'] env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL'] env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio'] if platform.mac_ver()[0] >= '10.6.0': env['HAVE_OPENCL'] = 1 env['LINKFLAGS'] += ['-weak_framework', 'OpenCL'] env['FRAMEWORKS'] += ['Cg'] -else: + +if not sys.platform == 'win32' and not sys.platform == 'darwin': + conf = env.Configure(custom_tests = tests, + config_h="Source/Core/Common/Src/Config.h") + if not conf.CheckPKGConfig('0.15.0'): print "Can't find pkg-config, some tests will fail" -shared = {} -shared['glew'] = shared['lzo'] = shared['sdl'] = \ -shared['soil'] = shared['sfml'] = shared['zlib'] = 0 -if not sys.platform == 'win32' and not sys.platform == 'darwin': + env['LINKFLAGS'] += ['-pthread'] + if env['shared_glew']: shared['glew'] = conf.CheckPKG('GLEW') if env['shared_sdl']: @@ -306,62 +317,17 @@ if not sys.platform == 'win32' and not sys.platform == 'darwin': print "Shared library " + lib + " not detected, " \ "falling back to the static library" -if shared['glew'] == 0: - env['CPPPATH'] += [basedir + 'Externals/GLew/include'] - dirs += ['Externals/GLew'] -if shared['lzo'] == 0: - env['CPPPATH'] += [basedir + 'Externals/LZO'] - dirs += ['Externals/LZO'] -if shared['sdl'] == 0: - env['CPPPATH'] += [basedir + 'Externals/SDL'] - env['CPPPATH'] += [basedir + 'Externals/SDL/include'] - dirs += ['Externals/SDL'] -if shared['soil'] == 0: - env['CPPPATH'] += [basedir + 'Externals/SOIL'] - dirs += ['Externals/SOIL'] -if shared['sfml'] == 0: - env['CPPPATH'] += [basedir + 'Externals/SFML/include'] - dirs += ['Externals/SFML/src'] -if shared['zlib'] == 0: - env['CPPPATH'] += [basedir + 'Externals/zlib'] - dirs += ['Externals/zlib'] + if not env['nowx']: + # wxGLCanvas does not play well with wxGTK + wxmods.remove('gl') + env['HAVE_WX'] = conf.CheckWXConfig(2.8, wxmods, 0) + wxconfig.ParseWXConfig(env) -if sys.platform == 'win32' or sys.platform == 'darwin': - env['wxgl'] = True -wxmods = ['aui', 'adv', 'core', 'base'] -if env['wxgl']: - env['USE_WX'] = 1 - wxmods.append('gl') -else: - env['USE_WX'] = 0 + if not env['HAVE_WX'] and not env['nowx']: + print "WX libraries not found - see config.log" + Exit(1) -if sys.platform == 'darwin': - wxver = '2.9' # 64-bit on OS X -else: - wxver = '2.8' - -if env['nowx']: - env['HAVE_WX'] = env['USE_WX'] = 0; -else: - env['HAVE_WX'] = conf.CheckWXConfig(wxver, wxmods, 0) - wxconfig.ParseWXConfig(env) - # wx-config wants us to link with the OS X QuickTime framework - # which is not available for x86_64 and we don't use it anyway. - # Strip it out to silence some harmless linker warnings. - if env['FRAMEWORKS'].count('QuickTime'): - env['FRAMEWORKS'].remove('QuickTime') - # Make sure that the libraries claimed by wx-config are valid - #env['HAVE_WX'] = conf.CheckPKG('c') - -if not env['HAVE_WX'] and not env['nowx']: - print "WX libraries not found - see config.log" - Exit(1) - -conf.Define('HAVE_WX', env['HAVE_WX']) -conf.Define('USE_WX', env['USE_WX']) - -if not sys.platform == 'win32' and not sys.platform == 'darwin': - env['LINKFLAGS'] += ['-pthread'] + conf.Define('HAVE_WX', env['HAVE_WX']) env['HAVE_BLUEZ'] = conf.CheckPKG('bluez') conf.Define('HAVE_BLUEZ', env['HAVE_BLUEZ']) @@ -399,11 +365,12 @@ if not sys.platform == 'win32' and not sys.platform == 'darwin': print "Must have GLU to build" Exit(1) if not conf.CheckPKG('Cg'): - print "Must have Cg framework from NVidia to build" + print "Must have Cg toolkit from NVidia to build" Exit(1) if not conf.CheckPKG('CgGL'): print "Must have CgGl to build" Exit(1) + if env['opencl']: env['HAVE_OPENCL'] = conf.CheckPKG('OpenCL') @@ -412,38 +379,58 @@ if not sys.platform == 'win32' and not sys.platform == 'darwin': conf.Define('DATA_DIR', "\"" + env['data_dir'] + "\"") conf.Define('LIBS_DIR', "\"" + env['prefix'] + 'lib/' + "\"") -conf.Define('HAVE_OPENCL', env['HAVE_OPENCL']) + # PGO - Profile Guided Optimization + if env['pgo']=='generate': + compileFlags.append('-fprofile-generate') + env['LINKFLAGS']='-fprofile-generate' + if env['pgo']=='use': + compileFlags.append('-fprofile-use') + env['LINKFLAGS']='-fprofile-use' -env['NOJIT'] = 0 -if env['nojit']: - env['NOJIT'] = 1 + # Profiling + if (flavour == 'prof'): + proflibs = [ '/usr/lib/oprofile', '/usr/local/lib/oprofile' ] + env['LIBPATH'].append(proflibs) + env['RPATH'].append(proflibs) + if conf.CheckPKG('opagent'): + conf.Define('USE_OPROFILE', 1) + else: + print "Can't build prof without oprofile, disabling" -conf.Define('NOJIT', env['NOJIT']) + conf.Define('HAVE_OPENCL', env['HAVE_OPENCL']) -# Lua -if not sys.platform == 'win32': - conf.Define('LUA_USE_LINUX') + # After all configuration tests are done + conf.Finish() -# Profiling -env['USE_OPROFILE'] = 0 -if (flavour == 'prof'): - proflibs = [ '/usr/lib/oprofile', '/usr/local/lib/oprofile' ] - env['LIBPATH'].append(proflibs) - env['RPATH'].append(proflibs) - if conf.CheckPKG('opagent'): - env['USE_OPROFILE'] = 1 - conf.Define('USE_OPROFILE', env['USE_OPROFILE']) - else: - print "Can't build prof without oprofile, disabling" +# Local (static) libraries must be first in the search path for the build in +# order that they can override system libraries, but they must not be found +# during autoconfiguration as they will then be detected as system libraries. +env['LIBPATH'].insert(0, env['local_libs']) -# After all configuration tests are done -conf.Finish() - -env['LIBPATH'].append(env['local_libs']) +if not shared['glew']: + env['CPPPATH'] += [basedir + 'Externals/GLew/include'] + dirs += ['Externals/GLew'] +if not shared['lzo']: + env['CPPPATH'] += [basedir + 'Externals/LZO'] + dirs += ['Externals/LZO'] +if not shared['sdl']: + env['CPPPATH'] += [basedir + 'Externals/SDL'] + env['CPPPATH'] += [basedir + 'Externals/SDL/include'] + dirs += ['Externals/SDL'] +if not shared['soil']: + env['CPPPATH'] += [basedir + 'Externals/SOIL'] + dirs += ['Externals/SOIL'] +if not shared['sfml']: + env['CPPPATH'] += [basedir + 'Externals/SFML/include'] + dirs += ['Externals/SFML/src'] +if not shared['zlib']: + env['CPPPATH'] += [basedir + 'Externals/zlib'] + dirs += ['Externals/zlib'] rev = utils.GenerateRevFile(env['flavor'], "Source/Core/Common/Src/svnrev_template.h", "Source/Core/Common/Src/svnrev.h") + # Print a nice progress indication when not compiling Progress(['-\r', '\\\r', '|\r', '/\r'], interval=5) @@ -478,8 +465,6 @@ for subdir in dirs: if sys.platform == 'darwin': env.Install(env['data_dir'], 'Data/Sys') env.Install(env['data_dir'], 'Data/User') - env.Install(env['binary_dir'] + 'Dolphin.app/Contents/Resources/', - 'Source/Core/DolphinWX/resources/Dolphin.icns') else: env.InstallAs(env['data_dir'] + 'sys', 'Data/Sys') env.InstallAs(env['data_dir'] + 'user', 'Data/User') diff --git a/Source/Core/AudioCommon/Src/SConscript b/Source/Core/AudioCommon/Src/SConscript index 1dfa0ca68f..f0a123198a 100644 --- a/Source/Core/AudioCommon/Src/SConscript +++ b/Source/Core/AudioCommon/Src/SConscript @@ -10,17 +10,18 @@ files = [ 'AudioCommon.cpp', ] +if sys.platform == 'win32': + files += [ 'DSoundStream.cpp' ] + if sys.platform == 'darwin': files += [ 'CoreAudioSoundStream.cpp' ] else: - if env['HAVE_OPENAL']: - files += [ 'OpenALStream.cpp', 'aldlist.cpp' ] - -if not sys.platform == 'win32' and not sys.platform == 'darwin': - if env['HAVE_AO']: - files += [ 'AOSoundStream.cpp' ] if env['HAVE_ALSA']: files += [ 'AlsaSoundStream.cpp' ] + if env['HAVE_AO']: + files += [ 'AOSoundStream.cpp' ] + if env['HAVE_OPENAL']: + files += [ 'OpenALStream.cpp', 'aldlist.cpp' ] if env['HAVE_PULSEAUDIO']: files += [ 'PulseAudioStream.cpp' ] diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 16e2da9ffd..37d153962e 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -111,7 +111,14 @@ extern const char *netplay_dolphin_ver; #else // Not windows -#include "Config.h" // Scons defines +#ifdef __APPLE__ +#if defined HAVE_WX && HAVE_WX +#define USE_WX 1 // Use wxGLCanvas +#endif // HAVE_WX +#else // __APPLE__ +#include "Config.h" // SCons autoconfiguration defines +#endif + // General defines #define POSIX 1 #define MAX_PATH 260 diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript index 574b7186a0..65dd82ee77 100644 --- a/Source/Core/Core/Src/SConscript +++ b/Source/Core/Core/Src/SConscript @@ -3,127 +3,125 @@ Import('env') import sys -files = ["ActionReplay.cpp", - "ARDecrypt.cpp", - "ConfigManager.cpp", - "Console.cpp", - "Core.cpp", - "CoreParameter.cpp", - "CoreRerecording.cpp", - "CoreTiming.cpp", - "OnFrame.cpp", - "MemTools.cpp", - "PatchEngine.cpp", - "PluginManager.cpp", - "LuaInterface.cpp", - "State.cpp", - "Tracer.cpp", - "VolumeHandler.cpp", - "Boot/Boot.cpp", - "Boot/Boot_BS2Emu.cpp", - "Boot/Boot_DOL.cpp", - "Boot/Boot_ELF.cpp", - "Boot/Boot_WiiWAD.cpp", - "Boot/ElfReader.cpp", - "Debugger/Debugger_SymbolMap.cpp", - "Debugger/Dump.cpp", - "Debugger/PPCDebugInterface.cpp", - "HW/AudioInterface.cpp", - "HW/CPU.cpp", - "HW/DSP.cpp", - "HW/DVDInterface.cpp", - "HW/EXI.cpp", - "HW/EXI_Channel.cpp", - "HW/EXI_Device.cpp", - "HW/EXI_DeviceIPL.cpp", - "HW/EXI_DeviceAD16.cpp", - "HW/EXI_DeviceAMBaseboard.cpp", - "HW/EXI_DeviceMemoryCard.cpp", - "HW/EXI_DeviceMic.cpp", - "HW/EXI_DeviceEthernet.cpp", - "HW/GPFifo.cpp", - "HW/GCPad.cpp", - "HW/GCPadEmu.cpp", - "HW/HW.cpp", - "HW/Memmap.cpp", - "HW/MemmapFunctions.cpp", - "HW/MemoryInterface.cpp", - "HW/ProcessorInterface.cpp", - "HW/SI.cpp", - "HW/SI_Device.cpp", - "HW/SI_DeviceAMBaseboard.cpp", - "HW/SI_DeviceGBA.cpp", - "HW/SI_DeviceGCController.cpp", - "HW/StreamADPCM.cpp", - "HW/SystemTimers.cpp", - "HW/VideoInterface.cpp", - "HW/WII_IOB.cpp", - "HW/WII_IPC.cpp", - "IPC_HLE/WII_IPC_HLE.cpp", - "IPC_HLE/WII_IPC_HLE_Device_DI.cpp", - "IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp", - "IPC_HLE/WII_IPC_HLE_Device_es.cpp", - "IPC_HLE/WII_IPC_HLE_Device_fs.cpp", - "IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp", - "IPC_HLE/WII_IPC_HLE_Device_net.cpp", - "IPC_HLE/WII_IPC_HLE_WiiMote.cpp", - "IPC_HLE/WII_IPC_HLE_Device_usb.cpp", - "IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp", - "IPC_HLE/WiiMote_HID_Attr.cpp", - "PowerPC/PowerPC.cpp", - "PowerPC/PPCAnalyst.cpp", - "PowerPC/PPCTables.cpp", - "PowerPC/LUT_frsqrtex.cpp", - "PowerPC/PPCCache.cpp", - "PowerPC/Profiler.cpp", - "PowerPC/SignatureDB.cpp", - "PowerPC/PPCSymbolDB.cpp", - "PowerPC/Interpreter/Interpreter.cpp", - "PowerPC/Interpreter/Interpreter_Branch.cpp", - "PowerPC/Interpreter/Interpreter_Integer.cpp", - "PowerPC/Interpreter/Interpreter_FloatingPoint.cpp", - "PowerPC/Interpreter/Interpreter_Paired.cpp", - "PowerPC/Interpreter/Interpreter_LoadStore.cpp", - "PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp", - "PowerPC/Interpreter/Interpreter_SystemRegisters.cpp", - "PowerPC/Interpreter/Interpreter_Tables.cpp", - "PowerPC/JitCommon/JitAsmCommon.cpp", - "PowerPC/JitCommon/JitCache.cpp", - "PowerPC/JitCommon/JitBackpatch.cpp", - "PowerPC/JitCommon/JitBase.cpp", - "PowerPC/JitCommon/Jit_Util.cpp", - "HLE/HLE.cpp", - "HLE/HLE_Misc.cpp", - "HLE/HLE_OS.cpp", - ] -if not env['NOJIT']: - files += ["PowerPC/Jit64IL/JitIL.cpp", - "PowerPC/Jit64IL/JitILAsm.cpp", - "PowerPC/Jit64IL/JitIL_Branch.cpp", - "PowerPC/Jit64IL/JitIL_Integer.cpp", - "PowerPC/Jit64IL/JitIL_FloatingPoint.cpp", - "PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp", - "PowerPC/Jit64IL/JitIL_Paired.cpp", - "PowerPC/Jit64IL/JitIL_LoadStore.cpp", - "PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp", - "PowerPC/Jit64IL/JitIL_SystemRegisters.cpp", - "PowerPC/Jit64IL/IR.cpp", - "PowerPC/Jit64IL/IR_X86.cpp", - "PowerPC/Jit64IL/JitIL_Tables.cpp", - ] - files += ["PowerPC/Jit64/Jit.cpp", - "PowerPC/Jit64/JitRegCache.cpp", - "PowerPC/Jit64/JitAsm.cpp", - "PowerPC/Jit64/Jit_Branch.cpp", - "PowerPC/Jit64/Jit_Integer.cpp", - "PowerPC/Jit64/Jit_FloatingPoint.cpp", - "PowerPC/Jit64/Jit_LoadStorePaired.cpp", - "PowerPC/Jit64/Jit_Paired.cpp", - "PowerPC/Jit64/Jit_LoadStore.cpp", - "PowerPC/Jit64/Jit_LoadStoreFloating.cpp", - "PowerPC/Jit64/Jit_SystemRegisters.cpp", - "PowerPC/Jit64/Jit64_Tables.cpp", - ] +files = [ + "ActionReplay.cpp", + "ARDecrypt.cpp", + "ConfigManager.cpp", + "Console.cpp", + "Core.cpp", + "CoreParameter.cpp", + "CoreRerecording.cpp", + "CoreTiming.cpp", + "OnFrame.cpp", + "MemTools.cpp", + "PatchEngine.cpp", + "PluginManager.cpp", + "LuaInterface.cpp", + "State.cpp", + "Tracer.cpp", + "VolumeHandler.cpp", + "Boot/Boot.cpp", + "Boot/Boot_BS2Emu.cpp", + "Boot/Boot_DOL.cpp", + "Boot/Boot_ELF.cpp", + "Boot/Boot_WiiWAD.cpp", + "Boot/ElfReader.cpp", + "Debugger/Debugger_SymbolMap.cpp", + "Debugger/Dump.cpp", + "Debugger/PPCDebugInterface.cpp", + "HLE/HLE.cpp", + "HLE/HLE_Misc.cpp", + "HLE/HLE_OS.cpp", + "HW/AudioInterface.cpp", + "HW/CPU.cpp", + "HW/DSP.cpp", + "HW/DVDInterface.cpp", + "HW/EXI.cpp", + "HW/EXI_Channel.cpp", + "HW/EXI_Device.cpp", + "HW/EXI_DeviceIPL.cpp", + "HW/EXI_DeviceAD16.cpp", + "HW/EXI_DeviceAMBaseboard.cpp", + "HW/EXI_DeviceMemoryCard.cpp", + "HW/EXI_DeviceMic.cpp", + "HW/EXI_DeviceEthernet.cpp", + "HW/GPFifo.cpp", + "HW/GCPad.cpp", + "HW/GCPadEmu.cpp", + "HW/HW.cpp", + "HW/Memmap.cpp", + "HW/MemmapFunctions.cpp", + "HW/MemoryInterface.cpp", + "HW/ProcessorInterface.cpp", + "HW/SI.cpp", + "HW/SI_Device.cpp", + "HW/SI_DeviceAMBaseboard.cpp", + "HW/SI_DeviceGBA.cpp", + "HW/SI_DeviceGCController.cpp", + "HW/StreamADPCM.cpp", + "HW/SystemTimers.cpp", + "HW/VideoInterface.cpp", + "HW/WII_IOB.cpp", + "HW/WII_IPC.cpp", + "IPC_HLE/WII_IPC_HLE.cpp", + "IPC_HLE/WII_IPC_HLE_Device_DI.cpp", + "IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp", + "IPC_HLE/WII_IPC_HLE_Device_es.cpp", + "IPC_HLE/WII_IPC_HLE_Device_fs.cpp", + "IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp", + "IPC_HLE/WII_IPC_HLE_Device_net.cpp", + "IPC_HLE/WII_IPC_HLE_WiiMote.cpp", + "IPC_HLE/WII_IPC_HLE_Device_usb.cpp", + "IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp", + "IPC_HLE/WiiMote_HID_Attr.cpp", + "PowerPC/PowerPC.cpp", + "PowerPC/PPCAnalyst.cpp", + "PowerPC/PPCTables.cpp", + "PowerPC/LUT_frsqrtex.cpp", + "PowerPC/PPCCache.cpp", + "PowerPC/Profiler.cpp", + "PowerPC/SignatureDB.cpp", + "PowerPC/PPCSymbolDB.cpp", + "PowerPC/Interpreter/Interpreter.cpp", + "PowerPC/Interpreter/Interpreter_Branch.cpp", + "PowerPC/Interpreter/Interpreter_Integer.cpp", + "PowerPC/Interpreter/Interpreter_FloatingPoint.cpp", + "PowerPC/Interpreter/Interpreter_Paired.cpp", + "PowerPC/Interpreter/Interpreter_LoadStore.cpp", + "PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp", + "PowerPC/Interpreter/Interpreter_SystemRegisters.cpp", + "PowerPC/Interpreter/Interpreter_Tables.cpp", + "PowerPC/JitCommon/JitAsmCommon.cpp", + "PowerPC/JitCommon/JitCache.cpp", + "PowerPC/JitCommon/JitBackpatch.cpp", + "PowerPC/JitCommon/JitBase.cpp", + "PowerPC/JitCommon/Jit_Util.cpp", + "PowerPC/Jit64IL/JitIL.cpp", + "PowerPC/Jit64IL/JitILAsm.cpp", + "PowerPC/Jit64IL/JitIL_Branch.cpp", + "PowerPC/Jit64IL/JitIL_Integer.cpp", + "PowerPC/Jit64IL/JitIL_FloatingPoint.cpp", + "PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp", + "PowerPC/Jit64IL/JitIL_Paired.cpp", + "PowerPC/Jit64IL/JitIL_LoadStore.cpp", + "PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp", + "PowerPC/Jit64IL/JitIL_SystemRegisters.cpp", + "PowerPC/Jit64IL/IR.cpp", + "PowerPC/Jit64IL/IR_X86.cpp", + "PowerPC/Jit64IL/JitIL_Tables.cpp", + "PowerPC/Jit64/Jit.cpp", + "PowerPC/Jit64/JitRegCache.cpp", + "PowerPC/Jit64/JitAsm.cpp", + "PowerPC/Jit64/Jit_Branch.cpp", + "PowerPC/Jit64/Jit_Integer.cpp", + "PowerPC/Jit64/Jit_FloatingPoint.cpp", + "PowerPC/Jit64/Jit_LoadStorePaired.cpp", + "PowerPC/Jit64/Jit_Paired.cpp", + "PowerPC/Jit64/Jit_LoadStore.cpp", + "PowerPC/Jit64/Jit_LoadStoreFloating.cpp", + "PowerPC/Jit64/Jit_SystemRegisters.cpp", + "PowerPC/Jit64/Jit64_Tables.cpp", + ] if sys.platform == 'win32': files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp" ] @@ -134,9 +132,9 @@ else: libs = [ 'bdisasm', - 'inputcommon', + 'inputcommon', 'lua', - 'sfml-network' + 'sfml-network' ] env_core = env.Clone(); diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj index 2626d701c0..02dea1579d 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcproj +++ b/Source/Core/DolphinWX/DolphinWX.vcproj @@ -863,10 +863,6 @@ RelativePath=".\src\GameListCtrl.h" > - - diff --git a/Source/Core/DolphinWX/Src/Globals.cpp b/Source/Core/DolphinWX/Src/Globals.cpp deleted file mode 100644 index 253518a7c6..0000000000 --- a/Source/Core/DolphinWX/Src/Globals.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Globals.h" diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index c047775e26..a5d44c8a55 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -34,7 +34,6 @@ if wxenv['HAVE_WX']: 'LuaWindow.cpp', 'LogWindow.cpp', 'GameListCtrl.cpp', - 'Globals.cpp', 'HotkeyDlg.cpp', 'ISOFile.cpp', 'ISOProperties.cpp', @@ -65,10 +64,13 @@ elif sys.platform == 'darwin': exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin' exeNoGUI = env['binary_dir'] + 'DolphinNoGUI' - env.Install(env['binary_dir'] + 'Dolphin.app/Contents/' + + wxenv.Install(env['binary_dir'] + 'Dolphin.app/Contents/' + 'Library/Frameworks/Cg.framework', '/Library/Frameworks/Cg.framework/Cg') + wxenv.Install(env['binary_dir'] + 'Dolphin.app/Contents/Resources/', + '#/Source/Core/DolphinWX/resources/Dolphin.icns') + wxenv.Plist( env['binary_dir'] + 'Dolphin.app/Contents/Info.plist', Value(dict( diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index d87d3be4df..1759516d5f 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -13,9 +13,12 @@ files = [ 'UDPWrapper.cpp' ] - if sys.platform == 'win32': files += [ + 'ControllerInterface/DInput/DInput.cpp', + 'ControllerInterface/DInput/DInputJoystick.cpp', + 'ControllerInterface/DInput/DInputKeyboardMouse.cpp' + 'ControllerInterface/XInput/XInput.cpp', ] elif sys.platform == 'darwin': files += [ diff --git a/Source/PluginSpecs/pluginspecs_wiimote.h b/Source/PluginSpecs/pluginspecs_wiimote.h index 342ca2bfd2..d079d263b1 100644 --- a/Source/PluginSpecs/pluginspecs_wiimote.h +++ b/Source/PluginSpecs/pluginspecs_wiimote.h @@ -8,7 +8,7 @@ #include "PluginSpecs.h" #include "ExportProlog.h" -#ifndef _WIN32 +#if !defined _WIN32 && !defined __APPLE__ #include "Config.h" #endif diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index dbea190bee..ec2c87d4ab 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -61,11 +61,6 @@ if sys.platform == 'win32': ] gfxenv['CPPPATH'] += libs -# Sanity check -if gfxenv['USE_WX'] and not gfxenv['HAVE_WX']: - print "Must have wx to use wxgl" - Return() - gfxenv.SharedLibrary( env['plugin_dir']+name, files, diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript index 4294cee59d..9143a22c3a 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript @@ -59,11 +59,6 @@ if sys.platform == 'win32': ] gfxenv['CPPPATH'] += libs -# Sanity check -if gfxenv['USE_WX'] and not gfxenv['HAVE_WX']: - print "Must have wx to use wxgl" - Return() - gfxenv.SharedLibrary( env['plugin_dir']+name, files,