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

Linux compile fix for billard's changes.

Browse Source 
(Had to do it myself since glen is now a windows person :P)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5356 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2010-04-13 06:09:45 +00:00
parent d8906d2a0c
commit 379c469343
7 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Plugins/Plugin_GCPadNew/Src/SConscript
View File

@ -7,29 +7,12 @@ name = "Plugin_GCPadNew"
padenv = env.Clone()
files = [
'Config.cpp',
'ControllerEmu.cpp',
'ControllerEmu/GCPad/GCPad.cpp',
'GCPadNew.cpp',
'ControllerInterface/ControllerInterface.cpp',
'IniFile.cpp'
'GCPadEmu.cpp',
]
if padenv['HAVE_SDL']:
files += [ 'ControllerInterface/SDL/SDL.cpp' ]
if sys.platform == 'darwin':
files += [ 'ControllerInterface/OSX/OSX.cpp', 'ControllerInterface/OSX/OSXPrivate.mm' ]
if sys.platform == 'linux2':
files += [ 'ControllerInterface/Xlib/Xlib.cpp' ]
if padenv['HAVE_WX']:
files += [
'ConfigDiag.cpp',
'ConfigDiagBitmaps.cpp',
]
padenv.Append(
LIBS = [ 'inputcommon', 'common' ],
LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ],
)
if sys.platform == 'darwin':

26
Source/Plugins/Plugin_WiimoteNew/Src/SConscript Normal file
View File

@ -0,0 +1,26 @@
# -*- python -*-
Import('env')
import sys
name = "Plugin_WiimoteNew"
wiinewenv = env.Clone()
files = [
'WiimoteEmu/WiimoteEmu.cpp',
'WiimoteEmu/Attachment/Classic.cpp',
'WiimoteEmu/Attachment/Attachment.cpp',
'WiimoteEmu/Attachment/Nunchuk.cpp',
'WiimoteEmu/EmuSubroutines.cpp',
'WiimoteEmu/Encryption.cpp',
'WiimoteNew.cpp',
]
wiinewenv.Append(
LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ],
)
if sys.platform == 'darwin':
wiinewenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'Cocoa' ]
wiinewenv.SharedLibrary(env['plugin_dir']+name, files)

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

@ -42,7 +42,7 @@ static const u8 eeprom_data_16D0[] = {
};
// array of accel data to emulate shaking
static const u8 shake_data[8] = { 0x80, 0x40, 0x01, 0x40, 0x80, 0xC0, 0xFF, 0xC0 };
const u8 shake_data[8] = { 0x80, 0x40, 0x01, 0x40, 0x80, 0xC0, 0xFF, 0xC0 };
const u16 button_bitmasks[] =
{