Do not forget to append the LINKFLAGS. Replaced "-framework name" with "-Wl,-framework,name" because the space inside the option seems to confuse SCons.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@626 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
866d15d3d8
commit
148fd7b96e
|
@ -39,13 +39,13 @@ if sys.platform == 'darwin':
|
|||
platform = 'mac'
|
||||
# SDL is currently the only way to get video on Mac OS X.
|
||||
useSDL = True
|
||||
# TODO: clean it up (use incpath and libpath)
|
||||
# TODO: clean it up (use incpath and libpath)
|
||||
# Use libraries from MacPorts.
|
||||
compileFlags.append('-I/opt/local/include')
|
||||
linkFlags.append('-L/opt/local/lib')
|
||||
# Use frameworks instead of plain libs, when possible.
|
||||
linkFlags += [
|
||||
'-framework %s' % framework
|
||||
'-Wl,-framework,%s' % framework
|
||||
for framework in [ 'OpenGL', 'Cg' ]
|
||||
]
|
||||
else:
|
||||
|
@ -53,8 +53,8 @@ else:
|
|||
# By default, GLX is used on Linux to setup OpenGL, but you can select SDL
|
||||
# instead if you like, by changing the line below.
|
||||
useSDL = False
|
||||
gfxenv.ParseConfig("pkg-config x11 --cflags --libs")
|
||||
gfxenv.ParseConfig("pkg-config xxf86vm --cflags --libs")
|
||||
gfxenv.ParseConfig("pkg-config x11 --cflags --libs")
|
||||
gfxenv.ParseConfig("pkg-config xxf86vm --cflags --libs")
|
||||
|
||||
# Libraries without pkg-config support.
|
||||
libs += [ 'GL', 'Cg', 'CgGL' ]
|
||||
|
@ -64,6 +64,7 @@ if useSDL:
|
|||
|
||||
gfxenv.Append(
|
||||
CXXFLAGS = compileFlags,
|
||||
LINKFLAGS = linkFlags,
|
||||
)
|
||||
|
||||
gfxenv.SharedLibrary(
|
||||
|
|
Loading…
Reference in New Issue