piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@329 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne
2008-08-26 22:28:42 +00:00
parent 0ebba1bde0
commit 59974dfb5b
11 changed files with 154 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Plugins/Plugin_DSP_HLE/Src/SConscript
View File

@ -1,22 +1,28 @@
Import('env')
import sys
files = ["DSPHandler.cpp",
"MailHandler.cpp",
"main.cpp",
"Config.cpp",
"Globals.cpp",
"PCHW/AOSoundStream.cpp",
"PCHW/Mixer.cpp",
"UCodes/UCode_AX.cpp",
"UCodes/UCode_CARD.cpp",
"UCodes/UCode_InitAudioSystem.cpp",
"UCodes/UCode_Jac.cpp",
"UCodes/UCode_ROM.cpp",
"UCodes/UCodes.cpp",
"UCodes/UCode_Zelda.cpp",
]
dspenv=env.Copy(LINKFLAGS = "`pkg-config --libs ao` ")
files = [
"DSPHandler.cpp",
"MailHandler.cpp",
"main.cpp",
"Config.cpp",
"Globals.cpp",
"PCHW/AOSoundStream.cpp",
"PCHW/Mixer.cpp",
"UCodes/UCode_AX.cpp",
"UCodes/UCode_CARD.cpp",
"UCodes/UCode_InitAudioSystem.cpp",
"UCodes/UCode_Jac.cpp",
"UCodes/UCode_ROM.cpp",
"UCodes/UCodes.cpp",
"UCodes/UCode_Zelda.cpp",
]
dspenv = env.Copy()
dspenv.Append(
CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`pkg-config --cflags ao`' ]),
LINKFLAGS = ' ' + ' '.join([ '`pkg-config --libs ao`' ])
)
if sys.platform == 'darwin':
dspenv.SharedLibrary("../../../../Binary/mac/Plugins/dsphle.so", files, LIBS = ["common"])

39
Source/Plugins/Plugin_DSP_LLE/Src/SConscript
View File

@ -1,18 +1,25 @@
Import('env')
output = "../../../../Binary/linux/Plugins/dsplle.so"
files = ["AOSoundStream.cpp",
"disassemble.cpp",
"gdsp_aram.cpp",
"gdsp_ext_op.cpp",
"gdsp_interface.cpp",
"gdsp_interpreter.cpp",
"gdsp_memory.cpp",
"gdsp_opcodes.cpp",
"gdsp_registers.cpp",
"Globals.cpp",
"opcodes.cpp",
"Tools.cpp",
"main.cpp",
]
env.Append(LINKFLAGS = " `pkg-config --libs ao`")
env.SharedLibrary(output, files, LIBS = ["common"])
files = [
"AOSoundStream.cpp",
"disassemble.cpp",
"gdsp_aram.cpp",
"gdsp_ext_op.cpp",
"gdsp_interface.cpp",
"gdsp_interpreter.cpp",
"gdsp_memory.cpp",
"gdsp_opcodes.cpp",
"gdsp_registers.cpp",
"Globals.cpp",
"opcodes.cpp",
"Tools.cpp",
"main.cpp",
]
dspenv = env.Copy()
dspenv.Append(
CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`pkg-config --cflags ao`' ]),
LINKFLAGS = ' ' + ' '.join([ '`pkg-config --libs ao`' ])
)
dspenv.SharedLibrary(output, files, LIBS = ["common"])

12
Source/Plugins/Plugin_PadSimple/Src/SConscript
View File

@ -6,7 +6,13 @@ if sys.platform == 'darwin':
else:
output = "../../../../Binary/linux/Plugins/padsimple.so"
files = ["main.cpp",
]
padenv=env.Copy(CXXFLAGS = " `pkg-config --cflags sdl`", LINKFLAGS = " `pkg-config --libs sdl`")
files = [
"main.cpp",
]
padenv = env.Copy()
padenv.Append(
CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`pkg-config --cflags sdl`' ]),
LINKFLAGS = ' ' + ' '.join([ '`pkg-config --libs sdl`' ])
)
padenv.SharedLibrary(output, files, LIBS=["common"])

8
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -23,6 +23,7 @@ files = [
'GUI/ConfigDlg.cpp',
]
compileFlags = [
'-fPIC',
'`wx-config --cppflags`',
]
linkFlags = [
@ -58,9 +59,10 @@ if useSDL:
compileFlags += [ '`sdl-config --cflags`', '-DUSE_SDL=1' ]
linkFlags += [ '`sdl-config --libs`' ]
gfxenv = env.Copy(
CXXFLAGS = ' '.join(compileFlags),
LINKFLAGS = ' '.join(linkFlags),
gfxenv = env.Copy()
gfxenv.Append(
CXXFLAGS = ' ' + ' '.join(compileFlags),
LINKFLAGS = ' ' + ' '.join(linkFlags)
)
gfxenv.SharedLibrary(
'../../../../Binary/%s/Plugins/zeroogl.so' % platform,

22
Source/Plugins/Plugin_nJoy_SDL/Src/SConscript
View File

@ -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" ])