mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 14:49:42 -06:00
fixed scons=parsing
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@591 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -20,8 +20,7 @@ files = [
|
||||
|
||||
dspenv = env.Clone()
|
||||
dspenv.Append(
|
||||
CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`pkg-config --cflags ao`' ]),
|
||||
LINKFLAGS = ' ' + ' '.join([ '`pkg-config --libs ao`' ])
|
||||
CXXFLAGS = [ '-fPIC', ],
|
||||
)
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
|
@ -17,9 +17,10 @@ files = [
|
||||
"main.cpp",
|
||||
]
|
||||
|
||||
dspenv = env.Clone()
|
||||
dspenv.Append(
|
||||
CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`pkg-config --cflags ao`' ]),
|
||||
LINKFLAGS = ' ' + ' '.join([ '`pkg-config --libs ao`' ])
|
||||
)
|
||||
dspenv.SharedLibrary(output, files, LIBS = ["common"])
|
||||
lleenv = env.Clone()
|
||||
lleenv.Append(
|
||||
CXXFLAGS = [ '-fPIC', ],
|
||||
)
|
||||
|
||||
|
||||
lleenv.SharedLibrary(output, files, LIBS = ["common"])
|
||||
|
@ -24,14 +24,15 @@ files = [
|
||||
]
|
||||
compileFlags = [
|
||||
'-fPIC',
|
||||
env['WXCPPFLAGS'],
|
||||
]
|
||||
linkFlags = [
|
||||
env['WXLIBFLAGS'],
|
||||
]
|
||||
libs = [
|
||||
'videocommon', 'common', 'GLEW',
|
||||
]
|
||||
|
||||
gfxenv = env.Clone()
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
platform = 'mac'
|
||||
# SDL is currently the only way to get video on Mac OS X.
|
||||
@ -49,23 +50,20 @@ 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
|
||||
# Libraries with pkg-config support.
|
||||
compileFlags.append('`pkg-config --cflags xxf86vm`')
|
||||
linkFlags.append('`pkg-config --libs xxf86vm`')
|
||||
gfxenv.ParseConfig("pkg-config --libs ao")
|
||||
|
||||
# Libraries without pkg-config support.
|
||||
libs += [ 'GL', 'Cg', 'CgGL', 'X11' ]
|
||||
|
||||
if useSDL:
|
||||
compileFlags += [ '`sdl-config --cflags`', '-DUSE_SDL=1' ]
|
||||
linkFlags += [ '`sdl-config --libs`' ]
|
||||
if useSDL:
|
||||
compileFlags += [ '-DUSE_SDL=1' ]
|
||||
|
||||
gfxenv = env.Clone()
|
||||
gfxenv.Append(
|
||||
CXXFLAGS = ' ' + ' '.join(compileFlags),
|
||||
LINKFLAGS = ' ' + ' '.join(linkFlags)
|
||||
CXXFLAGS = compileFlags,
|
||||
)
|
||||
|
||||
gfxenv.SharedLibrary(
|
||||
'../../../../Binary/%s/Plugins/zeroogl.so' % platform,
|
||||
files,
|
||||
LIBS = libs
|
||||
LIBS = gfxenv['LIBS'] + libs
|
||||
)
|
||||
|
@ -12,12 +12,9 @@ files = [
|
||||
|
||||
padenv = env.Clone()
|
||||
padenv.Append(
|
||||
CXXFLAGS = ' ' + ' '.join([
|
||||
'-fPIC', env['WXCPPFLAGS'], '`pkg-config --cflags sdl`'
|
||||
]),
|
||||
LINKFLAGS = ' ' + ' '.join([
|
||||
env['WXLIBFLAGS'], '`pkg-config --libs sdl`'
|
||||
])
|
||||
CXXFLAGS = [
|
||||
'-fPIC',
|
||||
],
|
||||
)
|
||||
padenv.SharedLibrary(output, files, LIBS = [ "common" ])
|
||||
|
||||
|
@ -14,11 +14,9 @@ files = [
|
||||
|
||||
padenv = env.Clone()
|
||||
padenv.Append(
|
||||
CXXFLAGS = ' ' + ' '.join([
|
||||
'-fPIC', env['WXCPPFLAGS'], '`pkg-config --cflags sdl`'
|
||||
]),
|
||||
LINKFLAGS = ' ' + ' '.join([
|
||||
env['WXLIBFLAGS'], '`pkg-config --libs sdl`'
|
||||
])
|
||||
CXXFLAGS = [
|
||||
'-fPIC',
|
||||
],
|
||||
)
|
||||
|
||||
padenv.SharedLibrary(output, files, LIBS = [ "common" ])
|
||||
|
Reference in New Issue
Block a user