piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the SCons build:

Browse Source 
With wxWidgets 2.9.2 now in Externals, SCons was the only
external dependency other than Xcode and building just SCons
from Macports caused a fair mount of extra stuff to be built
unnecessarily, so just include a copy of scons-local.

Always build wxWidgets from Externals which allows us to get
rid of the home-grown autoconf machinery in SconsTests.

The main use case for args.cache was the wxconfig option,
which is no longer relevant after the above changes and
caching options has a lot of potential for confusion,
especially since other build systems don't tend to do this,
so we no longer do it now.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7381 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-03-20 18:35:07 +00:00
parent d14efe561b
commit 215baff4c8
202 changed files with 47594 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Externals/wxWidgets3/SConscript vendored
View File

@ -13,11 +13,10 @@ env['CPPPATH'] += ['#Externals/wxWidgets3', '#Externals/wxWidgets3/include']
wxenv = env.Clone()
wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations']
wxenv['CCFLAGS'] += ['-Wno-shadow', '-Wno-sign-compare']
wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations', '-Wno-shadow']
wxenv['CPPDEFINES'] += ['WXBUILDING']
# gtk, msw, osx and shared files as of r67106
# gtk, msw, osx and shared files as of r67258
aui = [
'src/aui/auibar.cpp',
@ -145,15 +144,15 @@ common = [
'src/common/imagbmp.cpp',
'src/common/image.cpp',
'src/common/imagfill.cpp',
'src/common/imaggif.cpp',
'src/common/imagiff.cpp',
#'src/common/imaggif.cpp',
#'src/common/imagiff.cpp',
#'src/common/imagjpeg.cpp',
'src/common/imagpcx.cpp',
#'src/common/imagpcx.cpp',
'src/common/imagpng.cpp',
'src/common/imagpnm.cpp',
'src/common/imagtga.cpp',
#'src/common/imagpnm.cpp',
#'src/common/imagtga.cpp',
#'src/common/imagtiff.cpp',
'src/common/imagxpm.cpp',
#'src/common/imagxpm.cpp',
'src/common/init.cpp',
'src/common/intl.cpp',
'src/common/ipcbase.cpp',
@ -299,7 +298,7 @@ generic = [
'src/generic/commandlinkbuttong.cpp',
'src/generic/datavgen.cpp',
'src/generic/datectlg.cpp',
'src/generic/dbgrptg.cpp',
#'src/generic/dbgrptg.cpp',
'src/generic/dcpsg.cpp',
'src/generic/dirctrlg.cpp',
'src/generic/dragimgg.cpp',
@ -647,6 +646,7 @@ msw = [
'src/msw/ole/uuid.cpp',
'src/msw/ownerdrw.cpp',
'src/msw/palette.cpp',
'src/msw/panel.cpp',
'src/msw/pen.cpp',
'src/msw/penwin.cpp',
'src/msw/popupwin.cpp',

2
Externals/wxWidgets3/wx/wxcocoa.h vendored
View File

@ -313,7 +313,7 @@
#define wxUSE_XRC 0
#define wxUSE_XML 1
#define wxUSE_XML 0
#define wxUSE_AUI 1