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

(requires review for windows/mac)

Browse Source 
Fix up so that various libraries wont be fatal for build with scons
wiiuse lib is used only if HAVE_WIIUSE is defined to 1 
made major cleanup for darwin and osx64


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1404 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-12-05 13:46:19 +00:00
parent be3094b6b3
commit 064d45024c
13 changed files with 156 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,13 +3,19 @@
Import('env')
import sys
wxenv = env.Clone()
files = [
'BootManager.cpp',
'Config.cpp',
'cmdline.c',
]
if not env['osx64']:
libs = [
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
]
if wxenv['HAVE_WX']:
files += [
'AboutDolphin.cpp',
'ConfigMain.cpp',
@ -26,36 +32,21 @@ if not env['osx64']:
'stdafx.cpp',
]
libs = [
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
]
CPPDEFINES = [
'USE_XPM_BITMAPS',
'wxNEEDS_CHARPP',
],
wxenv = env.Clone()
if not wxenv['osx64']:
libs = [ 'debwx' ] + libs
wxenv.Append(
CPPDEFINES = [
'USE_XPM_BITMAPS',
'wxNEEDS_CHARPP',
],
LINKFLAGS = [
'-pthread',
],
LIBS = libs
)
else:
wxenv.Append(
CPPDEFINES = [
'USE_XPM_BITMAPS',
'wxNEEDS_CHARPP',
],
LINKFLAGS = [
'-pthread',
'-arch',
'x86_64'
],
LIBS = libs
)
wxenv.Append(
LINKFLAGS = [
'-pthread',
],
LIBS = libs
)
if sys.platform == 'darwin':
exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
@ -85,7 +76,8 @@ else:
exeGUI = env['binary_dir'] + 'Dolphin'
exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
objects = [ wxenv.Object(srcFile) for srcFile in files ]
if not wxenv['osx64']:
wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ])
#objects = [ wxenv.Object(srcFile) for srcFile in files ]
if not wxenv['HAVE_WX']:
wxenv.Program(exeGUI, files + [ 'Main.cpp' ])
wxenv.Program(exeNoGUI, files + [ 'MainNoGUI.cpp' ])