mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
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:
@ -23,8 +23,16 @@ files = [
|
||||
]
|
||||
|
||||
dspenv = env.Clone()
|
||||
dspenv.Append(
|
||||
if not dspenv['osx64']:
|
||||
dspenv.Append(
|
||||
CXXFLAGS = [ '-fPIC' ],
|
||||
LIBS = [ 'common' ],
|
||||
)
|
||||
else:
|
||||
dspenv.Append(
|
||||
CXXFLAGS = [ '-fPIC','-arch', 'x86_64' ],
|
||||
LINKFLAGS = [ '-arch', 'x86_64' ],
|
||||
LIBS = [ 'common' ],
|
||||
)
|
||||
|
||||
dspenv.SharedLibrary(output, files)
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
Reference in New Issue
Block a user