From 148fd7b96e733c3c661443819d8106b3f8287076 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Tue, 23 Sep 2008 00:11:33 +0000 Subject: [PATCH] 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 --- Source/Plugins/Plugin_VideoOGL/Src/SConscript | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index 70baea5684..e3545191f4 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -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(