piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prepare for the release of Xcode 4, which has working LTO

Browse Source 
with static libraries.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7280 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-03-03 04:35:03 +00:00
parent 4b8ed4f2c8
commit 540238cf79
26 changed files with 92 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,9 @@ files = [
if sys.platform == 'darwin':
files += [ 'CoreAudioSoundStream.cpp' ]
elif sys.platform == 'win32':
files += [ 'DSoundStream.cpp' ]
files += [ 'XAudio2Stream.cpp' ]
else:
if env['HAVE_ALSA']:
files += [ 'AlsaSoundStream.cpp' ]
@ -22,8 +25,5 @@ else:
files += [ 'OpenALStream.cpp', 'aldlist.cpp' ]
if env['HAVE_PULSEAUDIO']:
files += [ 'PulseAudioStream.cpp' ]
if sys.platform == 'win32':
files += [ 'DSoundStream.cpp' ]
files += [ 'XAudio2Stream.cpp' ]
env['LIBS'] += env.StaticObject(files)
env['LIBS'] += env.StaticLibrary('audiocommon', files)

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

@ -38,7 +38,7 @@ files = [
"Thunk.cpp",
"Timer.cpp",
"Version.cpp",
#"VideoBackendBase.cpp",
"VideoBackendBase.cpp",
"x64Emitter.cpp",
"x64Analyzer.cpp",
"Crypto/aes_cbc.cpp",
@ -53,7 +53,5 @@ if sys.platform == 'win32':
files += [ "ExtendedTrace.cpp" ]
files += [ "stdafx.cpp" ]
env['common'] = env.StaticObject(files)
env['CPPPATH'] += ['.']
env['LIBS'] += env['common']
env['LIBS'] += env.StaticObject('VideoBackendBase.cpp')
env['LIBS'] += env.StaticLibrary('common', files)

6
Source/Core/Core/Src/BootManager.cpp
View File

@ -22,9 +22,9 @@
// Call sequence: This file has one of the first function called when a game is booted,
// the boot sequence in the code is:
// DolphinWX: GameListCtrl.cpp OnActivated
// BootManager.cpp BootCore
// Core Core.cpp Init Thread creation
// DolphinWX: FrameTools.cpp StartGame
// Core BootManager.cpp BootCore
// Core.cpp Init Thread creation
// EmuThread Calls CBoot::BootUp
// Boot.cpp CBoot::BootUp()
// CBoot::EmulatedBS2_Wii() / GC() or Load_BS2()

2
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
View File

@ -235,7 +235,7 @@ void PrintObject(const T &Obj)
CompileTimeAssert<sizeof(ZeldaVoicePB) == 0x180> ensure_zpb_size_correct;
(void)ensure_zpb_size_correct;
for(int i = 0; i < sizeof(T); i++) {
for (size_t i = 0; i < sizeof(T); i++) {
if((i > 0) && ((i & 1) == 0))
ss << " ";

10
Source/Core/Core/Src/SConscript
View File

@ -32,9 +32,6 @@ files = [
"Debugger/Debugger_SymbolMap.cpp",
"Debugger/Dump.cpp",
"Debugger/PPCDebugInterface.cpp",
]
dspcorefiles = [
"DSP/assemble.cpp",
"DSP/disassemble.cpp",
"DSP/DSPAccelerator.cpp",
@ -64,9 +61,6 @@ dspcorefiles = [
"DSP/Jit/DSPJitMultiplier.cpp",
"DSP/Jit/DSPJitMisc.cpp",
"DSP/Jit/DSPJitRegCache.cpp",
]
files += [
"GeckoCode.cpp",
"GeckoCodeConfig.cpp",
"HLE/HLE.cpp",
@ -206,6 +200,4 @@ elif sys.platform == 'linux2' and env['HAVE_BLUEZ']:
else:
files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ]
env['dspcore'] = env.StaticObject(dspcorefiles)
env['LIBS'] += env.StaticObject(files)
env['LIBS'] += env['dspcore']
env['LIBS'] += env.StaticLibrary('core', files)

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

@ -26,4 +26,4 @@ files = [
'WiiWad.cpp',
]
env['LIBS'] += env.StaticObject(files)
env['LIBS'] += env.StaticLibrary('discio', files)

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

@ -5,13 +5,10 @@ import os
import sys
from SconsTests import utils
files = []
frameworksflags = []
if not env['HAVE_WX']:
files += ['MainNoGUI.cpp']
if env['nowx']:
files = ['MainNoGUI.cpp']
else:
files += [
files = [
'AboutDolphin.cpp',
'ARCodeAddEdit.cpp',
'GeckoCodeDiag.cpp',
@ -63,20 +60,18 @@ if sys.platform == 'win32':
elif sys.platform == 'darwin':
env['CPPPATH'] += ['#Externals']
env['FRAMEWORKPATH'] += ['Externals/Cg']
env['FRAMEWORKS'] += ['ApplicationServices', 'Carbon', 'Cocoa']
env['FRAMEWORKS'] += ['AudioUnit', 'IOBluetooth', 'IOKit', 'OpenGL']
env['FRAMEWORKSFLAGS'] = ['-Wl,-weak_framework,Cg']
env['FRAMEWORKSFLAGS'] += ['-Wl,-weak_framework,OpenCL']
env['LIBS'] += ['iconv', 'z']
frameworksflags += ['-Wl,-weak_framework,Cg']
frameworksflags += ['-Wl,-weak_framework,OpenCL']
# XXX
env['FRAMEWORKSFLAGS'] += ['-Wl,-weak_framework,QuickTime']
env['FRAMEWORKSFLAGS'] += ['-Wl,-no_arch_warnings']
exe = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin'
if env['HAVE_WX']:
env['LIBS'] += env['wxconfiglibs']
frameworksflags += ['-Wl,-weak_framework,AudioToolbox']
frameworksflags += ['-Wl,-weak_framework,Carbon']
frameworksflags += ['-Wl,-weak_framework,QuickTime']
frameworksflags += ['-Wl,-weak_framework,WebKit']
frameworksflags += ['-Wl,-no_arch_warnings']
else:
if env['nowx']:
exe += 'NoGUI'
env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' +
@ -134,7 +129,7 @@ elif sys.platform == 'darwin':
else:
files += ['X11Utils.cpp']
exe = env['binary_dir'] + '/dolphin-emu'
if not env['HAVE_WX']:
if env['nowx']:
exe += '-nogui'
env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys')
env.InstallAs(env['data_dir'] + '/user', '#Data/User')
@ -142,4 +137,4 @@ else:
env.Command('dummy', '#' + env['prefix'],
"find $SOURCES -name .svn -exec rm -rf {} +")
env.Program(exe, files, FRAMEWORKSFLAGS = frameworksflags)
env.Program(exe, files)

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

@ -30,4 +30,4 @@ elif env['HAVE_X11']:
'ControllerInterface/Xlib/Xlib.cpp',
]
env['LIBS'] += env.StaticObject(files)
env['LIBS'] += env.StaticLibrary('inputcommon', files)

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

@ -8,6 +8,7 @@ files = [
'BPStructs.cpp',
'CPMemory.cpp',
'CommandProcessor.cpp',
'Debugger.cpp',
'DLCache.cpp',
'Fifo.cpp',
'FramebufferManagerBase.cpp',
@ -44,7 +45,4 @@ files = [
'memcpy_amd.cpp',
]
if env['HAVE_WX']:
files += ['Debugger.cpp']
env['LIBS'] += env.StaticObject(files)
env['LIBS'] += env.StaticLibrary('videocommon', files)