Simplify the SCons build:

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

View File

@ -33,10 +33,6 @@ set(LIBS videocommon
${X11_LIBRARIES}
${wxWidgets_LIBRARIES})
if(WIN32)
set(SRCS ${SRCS} Src/Win32.cpp)
endif()
if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
set(LIBS ${LIBS} clrun)
endif()

View File

@ -32,7 +32,4 @@ files = [
if not env['nowx']:
files += ['Src/VideoConfigDialog.cpp']
if sys.platform == 'win32':
files += ['Src/Win32.cpp']
env['LIBS'] += env.StaticLibrary('videosoftware', files)