Append to LIBS instead of overriding. Fixes build problems on Mac OS X.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@622 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-09-22 23:36:16 +00:00
parent 7199c04c0c
commit 31f1fabbac
4 changed files with 24 additions and 21 deletions

View File

@ -3,6 +3,11 @@
Import('env') Import('env')
import sys import sys
if sys.platform == 'darwin':
output = "../../../../Binary/mac/Plugins/dsphle.so"
else:
output = "../../../../Binary/linux/Plugins/dsphle.so"
files = [ files = [
"DSPHandler.cpp", "DSPHandler.cpp",
"MailHandler.cpp", "MailHandler.cpp",
@ -22,10 +27,7 @@ files = [
dspenv = env.Clone() dspenv = env.Clone()
dspenv.Append( dspenv.Append(
CXXFLAGS = [ '-fPIC', ], CXXFLAGS = [ '-fPIC' ],
LIBS = [ 'common' ],
) )
dspenv.SharedLibrary(output, files)
if sys.platform == 'darwin':
dspenv.SharedLibrary("../../../../Binary/mac/Plugins/dsphle.so", files, LIBS = ["common"])
else:
dspenv.SharedLibrary("../../../../Binary/linux/Plugins/dsphle.so", files, LIBS = ["common"])

View File

@ -1,7 +1,12 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
output = "../../../../Binary/linux/Plugins/dsplle.so" import sys
if sys.platform == 'darwin':
output = "../../../../Binary/mac/Plugins/dsplle.so"
else:
output = "../../../../Binary/linux/Plugins/dsplle.so"
files = [ files = [
"AOSoundStream.cpp", "AOSoundStream.cpp",
@ -21,8 +26,7 @@ files = [
lleenv = env.Clone() lleenv = env.Clone()
lleenv.Append( lleenv.Append(
CXXFLAGS = [ '-fPIC', ], CXXFLAGS = [ '-fPIC' ],
LIBS = [ 'common' ],
) )
lleenv.SharedLibrary(output, files)
lleenv.SharedLibrary(output, files, LIBS = ["common"])

View File

@ -14,9 +14,8 @@ files = [
padenv = env.Clone() padenv = env.Clone()
padenv.Append( padenv.Append(
CXXFLAGS = [ CXXFLAGS = [ '-fPIC' ],
'-fPIC', LIBS = [ 'common' ],
],
) )
padenv.SharedLibrary(output, files, LIBS = [ "common" ]) padenv.SharedLibrary(output, files)

View File

@ -16,9 +16,7 @@ files = [
padenv = env.Clone() padenv = env.Clone()
padenv.Append( padenv.Append(
CXXFLAGS = [ CXXFLAGS = [ '-fPIC' ],
'-fPIC', LIBS = [ 'common' ],
],
) )
padenv.SharedLibrary(output, files)
padenv.SharedLibrary(output, files, LIBS = [ "common" ])