The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 15:49:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some scons updates,

Browse Source 
windows scons will build if dirs = 
    'Externals/Bochs_disasm',
    'Externals/LZO',
    'Externals/WiiUseSrc/Src', 
    #'Source/Core/Common/Src',
    #'Source/Core/Core/Src',
   # 'Source/Core/DiscIO/Src',
   # 'Source/Core/VideoCommon/Src',
    #'Source/Core/InputCommon/Src',
    'Source/Plugins/Plugin_VideoOGL/Src',
    #'Source/Plugins/Plugin_DSP_HLE/Src',
    'Source/Plugins/Plugin_DSP_LLE/Src',
    'Source/Plugins/Plugin_PadSimple/Src',
    'Source/Plugins/Plugin_PadSimpleEvnt/Src',
   # 'Source/Plugins/Plugin_nJoy_SDL/Src',
    #'Source/Plugins/Plugin_nJoy_Testing/Src',
    #'Source/Plugins/Plugin_Wiimote/Src',
   # 'Source/Core/DolphinWX/Src',
    'Source/Core/DebuggerWX/Src',

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2627 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99 2009-03-09 00:36:59 +00:00
parent ac11915892
commit f4ba5b3589
5 changed files with 70 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Externals/Bochs_disasm/SConscript vendored
View File

@ -1,6 +1,7 @@
# -*- python -*-
Import('env')
import sys
files = [
"dis_decode.cpp",
@ -10,6 +11,9 @@ files = [
"PowerPCDisasm.cpp",
]
if sys.platform == 'win32':
files += [ "stdafx.cpp" ]
env_bochs = env.Clone(
CCFLAGS = env.filterWarnings(env['CCFLAGS']),
CXXFLAGS = env.filterWarnings(env['CXXFLAGS']),

66
SConstruct
View File

@ -30,9 +30,10 @@ compileFlags = [
'-fno-exceptions',
'-fno-strict-aliasing',
'-msse2',
'-fvisibility=hidden',
#'-fomit-frame-pointer'
]
if sys.platform != 'win32':
compileFlags += [ '-fvisibility=hidden' ]
cppDefines = [
( '_FILE_OFFSET_BITS', 64),
@ -86,11 +87,6 @@ if sys.platform == 'darwin':
writePlist(properties, str(dstNode))
builders['Plist'] = Builder(action = createPlist)
if sys.platform == 'win32':
env_home = os.environ['USERPROFILE']
else:
env_home = os.environ['HOME']
lib_paths = include_paths
# handle command line options
@ -118,23 +114,40 @@ vars.AddVariables(
('CXX', 'The c++ compiler', 'g++'),
)
env = Environment(
CPPPATH = include_paths,
LIBPATH = lib_paths,
RPATH = [],
variables = vars,
ENV = {
'PATH' : os.environ['PATH'],
'HOME' : env_home
if sys.platform == 'win32':
env = Environment(
CPPPATH = include_paths,
LIBPATH = lib_paths,
RPATH = [],
LIBS = [],
tools = [ 'mingw' ],
variables = vars,
ENV = os.environ,
BUILDERS = builders,
DESCRIPTION = description,
SUMMARY = description,
LICENSE = license,
NAME = name,
VERSION = version,
)
else:
env = Environment(
CPPPATH = include_paths,
LIBPATH = lib_paths,
RPATH = [],
LIBS = [],
variables = vars,
ENV = {
'PATH' : os.environ['PATH'],
'HOME' : os.environ['HOME']
},
BUILDERS = builders,
DESCRIPTION = description,
SUMMARY = description,
LICENSE = license,
NAME = name,
VERSION = version,
)
BUILDERS = builders,
DESCRIPTION = description,
SUMMARY = description,
LICENSE = license,
NAME = name,
VERSION = version,
)
# save the given command line options
vars.Save('args.cache', env)
@ -180,7 +193,10 @@ if env['lint']:
compileFlags += [ '-W' + warning for warning in warnings ]
env['CCFLAGS'] = compileFlags
env['CXXFLAGS'] = compileFlags + [ '-fvisibility-inlines-hidden' ]
if sys.platform == 'win32':
env['CXXFLAGS'] = compileFlags
else:
env['CXXFLAGS'] = compileFlags + [ '-fvisibility-inlines-hidden' ]
env['CPPDEFINES'] = cppDefines
@ -249,6 +265,10 @@ if env['wxgl']:
env['HAVE_X11'] = 0
env['HAVE_COCOA'] = 0
if sys.platform == 'win32':
env['HAVE_WX'] = 1
env['USE_WX'] = 1
# Gui less build
if env['nowx']:
env['HAVE_WX'] = 0;

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

@ -1,31 +1,34 @@
# -*- python -*-
Import('env')
import sys
files = [
"ABI.cpp",
"MsgHandler.cpp",
"CDUtils.cpp",
"ChunkFile.cpp",
"ConsoleWindow.cpp",
"ColorUtil.cpp",
"ConsoleWindow.cpp",
"CPUDetect.cpp",
"DynamicLibrary.cpp",
"Hash.cpp",
"IniFile.cpp",
"ExtendedTrace.cpp",
"FileSearch.cpp",
"FileUtil.cpp",
"Hash.cpp",
"IniFile.cpp",
"MappedFile.cpp",
"MathUtil.cpp",
"Misc.cpp",
"MemArena.cpp",
"MemoryUtil.cpp",
"Misc.cpp",
"MsgHandler.cpp",
"Plugin.cpp",
"PluginDSP.cpp",
"PluginWiimote.cpp",
"PluginVideo.cpp",
"PluginPAD.cpp",
"StringUtil.cpp",
"Thread.cpp",
"Thunk.cpp",
"Timer.cpp",
"Thread.cpp",
@ -34,6 +37,9 @@ files = [
"x64Analyzer.cpp",
]
if sys.platform == 'win32':
files += [ "stdafx.cpp" ]
env_common = env.Clone()
env_common.Append(CXXFLAGS = [ '-fPIC' ])
env_common.StaticLibrary("common", files)

15
Source/Core/Core/Src/SConscript
View File

@ -1,21 +1,23 @@
# -*- python -*-
Import('env')
import sys
files = ["Console.cpp",
files = ["ActionReplay.cpp",
"ARDecrypt.cpp",
"ConfigManager.cpp",
"Console.cpp",
"Core.cpp",
"CoreTiming.cpp",
"CoreParameter.cpp",
"CoreRerecording.cpp",
"CoreTiming.cpp",
"Host.cpp",
"LogManager.cpp",
"MemTools.cpp",
"ActionReplay.cpp",
"ARDecrypt.cpp",
"PatchEngine.cpp",
"PluginManager.cpp",
"State.cpp",
"Tracer.cpp",
'PluginManager.cpp',
"VolumeHandler.cpp",
"Boot/Boot.cpp",
"Boot/Boot_BIOSEmu.cpp",
@ -119,6 +121,9 @@ else:
"PowerPC/Jit64/Jit_SystemRegisters.cpp",
]
if sys.platform == 'win32':
files += [ "stdafx.cpp" ]
libs = [
'bdisasm',
'inputcommon',

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

@ -60,6 +60,8 @@ if gfxenv['HAVE_COCOA']:
'-x',
'objective-c++',
]
if sys.platform == 'win32':
files += [ 'OS/Win32.cpp' ]
tests = {'CheckPKG' : utils.CheckPKG}
conf = gfxenv.Configure(custom_tests = tests,