ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compiling wiiuse on with CMake and SCons 

Also fix confusing formatting in a SConscript file

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6395 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
NeoBrainX 2010-11-13 19:36:33 +00:00
parent 7ad7acd248
commit e79fcce1d4
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -194,6 +194,7 @@ include_directories(Source/Core/DSPCore/Src)
include_directories(Source/Core/InputCommon/Src) include_directories(Source/Core/InputCommon/Src)
include_directories(Source/Core/InputUICommon/Src) include_directories(Source/Core/InputUICommon/Src)
include_directories(Source/Core/VideoCommon/Src) include_directories(Source/Core/VideoCommon/Src)
include_directories(Source/Core/wiiuse/Src)
######################################## ########################################
@ -269,17 +270,6 @@ else(ZLIB_FOUND)
include_directories(Externals/zlib) include_directories(Externals/zlib)
endif(ZLIB_FOUND) endif(ZLIB_FOUND)
if(UNIX OR APPLE)
add_subdirectory(Externals/WiiUse)
include_directories(Externals/WiiUse/Src)
elseif(WIN32)
# use the precompiled ones
# TODO: Use the 64 bit lib on 64 bit systems...
# TODO: If WDK is installed, we can compile this from source as well
find_library(WIIUSE wiiuse PATHS Externals/WiiUse/Win32 NO_DEFAULT_PATH)
include_directories(Externals/WiiUse/Src)
endif()
if(WIN32) if(WIN32)
find_library(GLEW glew32s PATHS Externals/GLew) find_library(GLEW glew32s PATHS Externals/GLew)
include_directories(Externals/GLew/include) include_directories(Externals/GLew/include)

2
SConstruct
View File

@ -98,7 +98,7 @@ if env['flavor'] == 'debug':
env['CPPDEFINES'] += ['_DEBUG'] env['CPPDEFINES'] += ['_DEBUG']
elif env['flavor'] == 'fastlog': elif env['flavor'] == 'fastlog':
env['CPPDEFINES'] += ['DEBUGFAST'] env['CPPDEFINES'] += ['DEBUGFAST']
env['CPPPATH'] = ['#Source/PluginSpecs'] env['CPPPATH'] = ['#Source/PluginSpecs', 'Source/Core/wiiuse/Src']
env['LIBPATH'] = [] env['LIBPATH'] = []
env['LIBS'] = [] env['LIBS'] = []

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

@ -97,11 +97,12 @@ elif sys.platform == 'darwin' and env['HAVE_WX']:
env.Fixup(exeGUIdist, exeGUI) env.Fixup(exeGUIdist, exeGUI)
else: else:
files += [ 'X11Utils.cpp' ] files += [ 'X11Utils.cpp' ]
libs += [ 'SDL' ]
exeGUI = env['binary_dir'] + '/dolphin-emu' libs += [ 'SDL' ]
exeNoGUI = env['binary_dir'] + '/dolphin-emu-nogui' exeGUI = env['binary_dir'] + '/dolphin-emu'
env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys') exeNoGUI = env['binary_dir'] + '/dolphin-emu-nogui'
env.InstallAs(env['data_dir'] + '/user', '#Data/User') env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys')
env.InstallAs(env['data_dir'] + '/user', '#Data/User')
if env['HAVE_WX']: if env['HAVE_WX']:
env.Program(exeGUI, files, LIBS = wxlibs + libs + env['LIBS']) env.Program(exeGUI, files, LIBS = wxlibs + libs + env['LIBS'])