mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
Only use "-fPIC" for compiling objects that will be part of dynamic libs. Make SConscripts inherit the compile flags from the top level instead of overriding them.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@329 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -6,9 +6,19 @@ if sys.platform == 'darwin':
|
||||
else:
|
||||
output = "../../../../Binary/linux/Plugins/Plugin_nJoy_SDL.so"
|
||||
|
||||
files = [ "nJoy.cpp",
|
||||
"GUI/AboutBox.cpp",
|
||||
"GUI/ConfigBox.cpp",
|
||||
]
|
||||
padenv=env.Copy(CXXFLAGS = " `wx-config --cppflags` `pkg-config --cflags sdl`", LINKFLAGS = "`wx-config --libs` `pkg-config --libs sdl` ")
|
||||
padenv.SharedLibrary(output, files, LIBS=["common"])
|
||||
files = [
|
||||
"nJoy.cpp",
|
||||
"GUI/AboutBox.cpp",
|
||||
"GUI/ConfigBox.cpp",
|
||||
]
|
||||
|
||||
padenv = env.Copy()
|
||||
padenv.Append(
|
||||
CXXFLAGS = ' ' + ' '.join([
|
||||
'-fPIC', '`wx-config --cppflags`', '`pkg-config --cflags sdl`'
|
||||
]),
|
||||
LINKFLAGS = ' ' + ' '.join([
|
||||
'`wx-config --libs`', '`pkg-config --libs sdl`'
|
||||
])
|
||||
)
|
||||
padenv.SharedLibrary(output, files, LIBS = [ "common" ])
|
||||
|
Reference in New Issue
Block a user