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

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

View File

@ -23,7 +23,9 @@
#include "PadSimple.h"
#include "IniFile.h"
#if !defined(OSX64)
#include "GUI/ConfigDlg.h"
#endif
#ifdef _WIN32
#include "XInput.h"
@ -163,7 +165,7 @@ void DllConfig(HWND _hParent)
ConfigDialog frame(&win);
frame.ShowModal();
win.SetHWND(0);
#else
#elif !defined(OSX64)
ConfigDialog frame(NULL);
frame.ShowModal();
#endif

View File

@ -10,11 +10,21 @@ else:
files = [
"PadSimple.cpp",
"XInputBase.cpp",
"GUI/ConfigDlg.cpp",
]
padenv = env.Clone()
if not padenv['osx64']:
file += [
"GUI/ConfigDlg.cpp",
"XInputBase.cpp",
]
padenv.Append(LIBS = [ 'common' ])
if not env['osx64']:
padenv.SharedLibrary(output, files)
if padenv['osx64']:
padenv.Append(
CXXFLAGS = [ '-arch', 'x86_64' ],
LINKFLAGS = [ '-arch', 'x86_64' ],
)
padenv.SharedLibrary(output, files)