piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleaned up SConscripts

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@602 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-09-21 19:54:29 +00:00
parent 5c6407b805
commit e0291e735c
15 changed files with 62 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Externals/Bochs_disasm/SConscript vendored
View File

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
files = [
@ -8,14 +10,9 @@ files = [
"PowerPCDisasm.cpp",
]
def filterWarnings(flags):
return ' '.join(
flag
for flag in flags
if not flag.startswith('-W')
)
env_bochs = env.Clone(
CCFLAGS = filterWarnings(env['CCFLAGS']),
CXXFLAGS = filterWarnings(env['CXXFLAGS']),
CCFLAGS = env.filterWarnings(env['CCFLAGS']),
CXXFLAGS = env.filterWarnings(env['CXXFLAGS']),
)
env_bochs.StaticLibrary("bdisasm", files)

12
Externals/LZO/SConscript vendored
View File

@ -1,17 +1,13 @@
# -*- python -*-
Import('env')
files = [
"minilzo.c",
]
def filterWarnings(flags):
return ' '.join(
flag
for flag in flags
if not flag.startswith('-W')
)
env_lzo = env.Clone(
CCFLAGS = filterWarnings(env['CCFLAGS']),
CXXFLAGS = filterWarnings(env['CXXFLAGS']),
CCFLAGS = env.filterWarnings(env['CCFLAGS']),
CXXFLAGS = env.filterWarnings(env['CXXFLAGS']),
)
env_lzo.StaticLibrary("minilzo", files)

13
SConstruct
View File

@ -6,6 +6,7 @@ import sys
# Home made tests
sys.path.append('SconsTests')
import wxconfig
import utils
# Some features needs at least scons 0.98
EnsureSConsVersion(0, 98)
@ -115,14 +116,21 @@ env = Environment(
VERSION = version,
)
# save the given command line options
vars.Save('args.cache', env)
# verbose compile
if not env['verbose']:
env['CCCOMSTR'] = "Compiling $TARGET"
env['CXXCOMSTR'] = "Compiling $TARGET"
env['ARCOMSTR'] = "AR $TARGET"
env['ARCOMSTR'] = "Archiving $TARGET"
env['LINKCOMSTR'] = "Linking $TARGET"
env['ASCOMSTR'] = "Assembling $TARGET"
env['ASPPCOMSTR'] = "Assembling $TARGET"
env['SHCCCOMSTR'] = "Compiling shared $TARGET"
env['SHCXXCOMSTR'] = "Compiling shared $TARGET"
env['SHLINKCOMSTR'] = "Linking shared $TARGET"
env['RANLIBCOMSTR'] = "Indexing $TARGET"
# build falvuor
flavour = ARGUMENTS.get('flavor')
@ -173,6 +181,9 @@ env.ParseConfig("pkg-config --cflags --libs ao")
# After all configuration tests are done
env = conf.Finish()
# add methods from utils to env
env.AddMethod(utils.filterWarnings)
Export('env')
# print a nice progress indication when not compiling

2
Source/Core/Common/Src/SConscript
View File

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
files = [

2
Source/Core/Core/Src/SConscript
View File

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
files = ["Console.cpp",

14
Source/Core/DebuggerWX/src/SConscript
View File

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
files = ["LogWindow.cpp",
@ -17,14 +19,16 @@ files = ["LogWindow.cpp",
]
wxenv = env.Clone()
wxenv.Append(
CXXFLAGS = [
'-DUSE_XPM_BITMAPS',
'-DwxNEEDS_CHARPP'
CPPDEFINES = [
'USE_XPM_BITMAPS',
'wxNEEDS_CHARPP'
],
LINKFLAGS = [
'-L/usr/local/lib',
'-pthread',
]
)
libs = [
'common'
]
wxenv.StaticLibrary("debwx", files, LIBS = [ "common" ])
wxenv.StaticLibrary("debwx", files, LIBS = libs)

7
Source/Core/DiscIO/Src/SConscript
View File

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
files = ["BannerLoader.cpp",
@ -16,4 +18,7 @@ files = ["BannerLoader.cpp",
"AES/aes_cbc.c",
"AES/aes_core.c",
]
env.StaticLibrary("discio", files, LIBS = ["common"])
libs = [
'common'
]
env.StaticLibrary("discio", files, LIBS = libs)

9
Source/Core/DolphinWX/Src/SConscript
View File

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
import sys
@ -23,12 +25,11 @@ libs = [
wxenv = env.Clone()
wxenv.Append(
CXXFLAGS = [
'-DUSE_XPM_BITMAPS',
'-DwxNEEDS_CHARPP',
CPPDEFINES = [
'USE_XPM_BITMAPS',
'wxNEEDS_CHARPP',
],
LINKFLAGS = [
'-L/usr/local/lib',
'-pthread',
]
)

2
Source/Core/VideoCommon/Src/SConscript
View File

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
files = [

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

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
import sys

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

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
output = "../../../../Binary/linux/Plugins/dsplle.so"

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

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
import sys

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

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
import sys
@ -37,6 +39,7 @@ 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)
# Use libraries from MacPorts.
compileFlags.append('-I/opt/local/include')
linkFlags.append('-L/opt/local/lib')
@ -50,7 +53,7 @@ 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 --libs ao")
gfxenv.ParseConfig("pkg-config x11 --cflags --libs")
# Libraries without pkg-config support.
libs += [ 'GL', 'Cg', 'CgGL', 'X11' ]

2
Source/Plugins/Plugin_Wiimote_Test/Src/SConscript
View File

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
import sys

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

@ -1,3 +1,5 @@
# -*- python -*-
Import('env')
import sys