piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some more attempts at cleaning up the scons build and more clearly

Browse Source 
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
This commit is contained in:
Soren Jorvang
2010-07-09 01:26:53 +00:00
parent 07973f726e
commit 0284a7a1df
12 changed files with 241 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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' ]

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

@ -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

244
Source/Core/Core/Src/SConscript
View File

@ -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();

4
Source/Core/DolphinWX/DolphinWX.vcproj
View File

@ -863,10 +863,6 @@
RelativePath=".\src\GameListCtrl.h"
>
</File>
<File
RelativePath=".\src\Globals.cpp"
>
</File>
<File
RelativePath=".\src\Globals.h"
>

18
Source/Core/DolphinWX/Src/Globals.cpp
View File

@ -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"

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

@ -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(

5
Source/Core/InputCommon/Src/SConscript
View File

@ -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 += [

2
Source/PluginSpecs/pluginspecs_wiimote.h
View File

@ -8,7 +8,7 @@
#include "PluginSpecs.h"
#include "ExportProlog.h"
#ifndef _WIN32
#if !defined _WIN32 && !defined __APPLE__
#include "Config.h"
#endif

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

@ -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,

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

@ -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,