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

Fix the nowx build. Do we still want to keep the nowx build? If you do speak up now because soren wants to remove it.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5851 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-07-08 00:52:46 +00:00
parent 0cdfef4056
commit 75be9ce40d
7 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Source/Plugins/Plugin_Wiimote/Src/SConscript
View File

@ -7,28 +7,29 @@ wmenv = env.Clone()
name = "Plugin_Wiimote"
files = [
"Config.cpp",
"DataReports.cpp",
"EmuDefinitions.cpp",
"EmuDynamics.cpp",
"EmuMain.cpp",
"EmuPad.cpp",
"EmuSubroutines.cpp",
"Encryption.cpp",
"main.cpp",
"Rumble.cpp",
"Config.cpp",
"DataReports.cpp",
"EmuDefinitions.cpp",
"EmuDynamics.cpp",
"EmuMain.cpp",
"EmuPad.cpp",
"EmuSubroutines.cpp",
"Encryption.cpp",
"main.cpp",
"Rumble.cpp",
"UDPWiimote.cpp"
]
if wmenv['HAVE_WX']:
files += [
"ConfigBasicDlg.cpp",
"ConfigPadDlg.cpp",
"ConfigGamepad.cpp",
"FillReport.cpp",
]
libs = [ 'inputcommon', 'common', 'SDL' ]
libs = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ]
if wmenv['HAVE_WX']:
libs = [ 'inputuicommon' ] + libs
files += [
"ConfigBasicDlg.cpp",
"ConfigPadDlg.cpp",
"ConfigGamepad.cpp",
"FillReport.cpp",
]
cxxflags = [ ]

31
Source/Plugins/Plugin_WiimoteNew/Src/SConscript
View File

@ -7,27 +7,30 @@ name = "Plugin_WiimoteNew"
wiinewenv = env.Clone()
files = [
'WiimoteEmu/WiimoteEmu.cpp',
'WiimoteEmu/Attachment/Classic.cpp',
'WiimoteEmu/Attachment/Attachment.cpp',
'WiimoteEmu/Attachment/Nunchuk.cpp',
'WiimoteEmu/Attachment/UDPNunchuk.cpp',
'WiimoteEmu/Attachment/Drums.cpp',
'WiimoteEmu/Attachment/Guitar.cpp',
'WiimoteEmu/EmuSubroutines.cpp',
'WiimoteEmu/Encryption.cpp',
'WiimoteEmu/Speaker.cpp',
'WiimoteNew.cpp',
'WiimoteConfigDiag.cpp',
'WiimoteEmu/WiimoteEmu.cpp',
'WiimoteEmu/Attachment/Classic.cpp',
'WiimoteEmu/Attachment/Attachment.cpp',
'WiimoteEmu/Attachment/Nunchuk.cpp',
'WiimoteEmu/Attachment/UDPNunchuk.cpp',
'WiimoteEmu/Attachment/Drums.cpp',
'WiimoteEmu/Attachment/Guitar.cpp',
'WiimoteEmu/EmuSubroutines.cpp',
'WiimoteEmu/Encryption.cpp',
'WiimoteEmu/Speaker.cpp',
'WiimoteNew.cpp'
]
libs = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ]
libs = [ 'inputcommon', 'common', 'SDL' ]
cxxflags = [ ]
if wiinewenv['HAVE_WX']:
libs = [ 'inputuicommon' ] + libs
files += [ 'WiimoteConfigDiag.cpp' ]
if wiinewenv['HAVE_WIIUSE']:
cxxflags += [ '-DHAVE_WIIUSE' ]
files += [ "WiimoteReal/WiimoteReal.cpp" ]
files += [ 'WiimoteReal/WiimoteReal.cpp' ]
libs += [ 'wiiuse' ]
wiinewenv.Append(

2
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp
View File

@ -2,13 +2,13 @@
#include "Common.h"
#include "pluginspecs_wiimote.h"
#include "WiimoteConfigDiag.h"
#include "WiimoteReal/WiimoteReal.h"
#include "ControllerInterface/ControllerInterface.h"
#include "WiimoteEmu/WiimoteEmu.h"
#if defined(HAVE_WX) && HAVE_WX
#include "WiimoteConfigDiag.h"
#include "../../InputUICommon/Src/ConfigDiag.h"
#endif
#include "../../InputCommon/Src/InputConfig.h"