mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-01 02:29:59 -06:00
An almost linux/osx compile fix beside some undefined references
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5581 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -22,7 +22,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include <ControllerInterface/ControllerInterface.h>
|
||||
#include <Config.h>
|
||||
#include <ConfigInput.h>
|
||||
#include "FileSearch.h"
|
||||
|
||||
class PadSetting
|
||||
|
@ -1,19 +1,13 @@
|
||||
# -*- python -*-
|
||||
|
||||
Import('env')
|
||||
|
||||
files = [
|
||||
'Config.cpp',
|
||||
'ControllerEmu.cpp',
|
||||
]
|
||||
|
||||
if env['HAVE_WX']:
|
||||
files += [
|
||||
'ConfigDiagBitmaps.cpp',
|
||||
'ConfigDiag.cpp',
|
||||
]
|
||||
|
||||
files = [
|
||||
'ConfigDiagBitmaps.cpp',
|
||||
'ConfigDiag.cpp',
|
||||
'WXInputBase.cpp'
|
||||
]
|
||||
|
||||
|
||||
|
||||
env_inputpc = env.Clone()
|
||||
env_inputpc.StaticLibrary(env['local_libs'] + "inputplugincommon", files)
|
||||
env_inputpc = env.Clone()
|
||||
env_inputpc.StaticLibrary(env['local_libs'] + "inputuicommon", files)
|
||||
|
@ -20,7 +20,7 @@ files = [
|
||||
]
|
||||
|
||||
wiinewenv.Append(
|
||||
LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ],
|
||||
LIBS = [ 'inputuicommon', 'inputcommon', 'common' ],
|
||||
)
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
|
Reference in New Issue
Block a user