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

now core, padsimple and dsp null can be buil in 64bit on osx

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@947 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
tmator
2008-10-24 15:48:36 +00:00
parent 63f3e1ab8c
commit a03f39ac36
11 changed files with 84 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,10 +29,10 @@ libs = [
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
]
if not env['osx64']:
libs = [ 'debwx' ] + libs
wxenv = env.Clone()
wxenv.Append(
if not wxenv['osx64']:
libs = [ 'debwx' ] + libs
wxenv.Append(
CPPDEFINES = [
'USE_XPM_BITMAPS',
'wxNEEDS_CHARPP',
@ -42,6 +42,19 @@ wxenv.Append(
],
LIBS = libs
)
else:
wxenv.Append(
CPPDEFINES = [
'USE_XPM_BITMAPS',
'wxNEEDS_CHARPP',
],
LINKFLAGS = [
'-pthread',
'-arch',
'x86_64'
],
LIBS = libs
)
if sys.platform == 'darwin':
exeGUI = '../../../../Binary/mac/Dolphin.app/Contents/MacOS/Dolphin'
@ -72,6 +85,6 @@ else:
exeNoGUI = '../../../../Binary/linux/DolphinNoGUI'
objects = [ wxenv.Object(srcFile) for srcFile in files ]
if not env['osx64']:
if not wxenv['osx64']:
wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ])