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:
nakeee
2010-06-03 05:59:58 +00:00
parent edabeffaaf
commit a34ad40517
12 changed files with 19 additions and 37 deletions

View File

@ -22,7 +22,7 @@
#include <vector>
#include <ControllerInterface/ControllerInterface.h>
#include <Config.h>
#include <ConfigInput.h>
#include "FileSearch.h"
class PadSetting

View File

@ -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)

View File

@ -20,7 +20,7 @@ files = [
]
wiinewenv.Append(
LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ],
LIBS = [ 'inputuicommon', 'inputcommon', 'common' ],
)
if sys.platform == 'darwin':