Index: Source/Plugins/Plugin_DSP_LLE/Src/SConscript =================================================================== --- Source/Plugins/Plugin_DSP_LLE/Src/SConscript (revision 3874) +++ Source/Plugins/Plugin_DSP_LLE/Src/SConscript (working copy) @@ -10,6 +10,11 @@ print name + " must have AO to be build" Return() +libs = [ 'dspcore', 'audiocommon', 'common' ] + +if env['HAVE_WX']: + libs += [ 'debugger_ui_util' ] + files = [ "Config.cpp", "DSPDebugInterface.cpp", @@ -33,7 +38,7 @@ lleenv = env.Clone() lleenv.Append( CXXFLAGS = [ '-fPIC' ], - LIBS = [ 'dspcore', 'audiocommon', 'common', 'debugger_ui_util' ], + LIBS = libs, ) lleenv.SharedLibrary(env['plugin_dir']+name, files) Index: Source/Plugins/Plugin_VideoOGL/Src/main.cpp =================================================================== --- Source/Plugins/Plugin_VideoOGL/Src/main.cpp (revision 3874) +++ Source/Plugins/Plugin_VideoOGL/Src/main.cpp (working copy) @@ -314,7 +314,9 @@ g_Config.Load(); g_Config.GameIniLoad(); +#if defined(HAVE_WX) && HAVE_WX g_Config.UpdateProjectionHack(); +#endif if (!OpenGL_Create(g_VideoInitialize, 640, 480)) // 640x480 will be the default if all else fails { Index: Source/Plugins/Plugin_Wiimote/Src/DataReports.cpp =================================================================== --- Source/Plugins/Plugin_Wiimote/Src/DataReports.cpp (revision 3874) +++ Source/Plugins/Plugin_Wiimote/Src/DataReports.cpp (working copy) @@ -261,8 +261,8 @@ } else if(g_Config.iExtensionConnected == EXT_GUITARHERO3_CONTROLLER) { - FillReportGuitarHero3Extension(_GH3_ext); - memcpy(&pReport->ext, &_GH3_ext, sizeof(_GH3_ext)); + //FillReportGuitarHero3Extension(_GH3_ext); + // memcpy(&pReport->ext, &_GH3_ext, sizeof(_GH3_ext)); } INFO_LOG(WII_IPC_WIIMOTE, " SendReportCoreAccelIr10Ext()"); Index: Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp =================================================================== --- Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp (revision 3874) +++ Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp (working copy) @@ -508,6 +508,7 @@ NSDistantObject *proxy; conn = [NSConnection connectionWithRegisteredName:@"DolphinCocoaEvent" host:nil]; + if (!conn) { //printf("error creating cnx event client\n"); } Index: Source/Core/Common/Src/FileUtil.cpp =================================================================== --- Source/Core/Common/Src/FileUtil.cpp (revision 3874) +++ Source/Core/Common/Src/FileUtil.cpp (working copy) @@ -35,7 +35,7 @@ #if defined(__APPLE__) #include -#include +#include #include #include #endif @@ -560,9 +560,7 @@ pluginsDir = PLUGINS_DIR; #endif -#if !defined (__APPLE__) pluginsDir += DIR_SEP; -#endif INFO_LOG(COMMON, "GetPluginsDirectory: Setting to %s:", pluginsDir.c_str()); return pluginsDir; Index: Source/Core/Common/Src/FileSearch.cpp =================================================================== --- Source/Core/Common/Src/FileSearch.cpp (revision 3874) +++ Source/Core/Common/Src/FileSearch.cpp (working copy) @@ -101,7 +101,12 @@ if ( (s.size() > ext.size()) && (!strcasecmp(s.substr(s.size() - ext.size()).c_str(), ext.c_str())) ) { - std::string full_name = _strPath + "/" + s; + std::string full_name = _strPath; + if (_strPath.at(_strPath.size() - 1) != '/') + { + full_name += "/"; + } + full_name += s; m_FileNames.push_back(full_name); } } Index: Source/Core/DebuggerUICommon/Src/SConscript =================================================================== --- Source/Core/DebuggerUICommon/Src/SConscript (revision 3874) +++ Source/Core/DebuggerUICommon/Src/SConscript (working copy) @@ -9,7 +9,7 @@ 'MemoryView.cpp', ] -acenv = env.Clone() -acenv.Append(CXXFLAGS = [ '-fPIC' ]) + acenv = env.Clone() + acenv.Append(CXXFLAGS = [ '-fPIC' ]) -acenv.StaticLibrary(env['local_libs'] + 'debugger_ui_util', files) + acenv.StaticLibrary(env['local_libs'] + 'debugger_ui_util', files) Index: Source/Core/DolphinWX/Src/SConscript =================================================================== --- Source/Core/DolphinWX/Src/SConscript (revision 3874) +++ Source/Core/DolphinWX/Src/SConscript (working copy) @@ -12,10 +12,11 @@ libs = [ 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'inputcommon', - 'common', 'z', 'debugger_ui_util' + 'common', 'z' ] if wxenv['HAVE_WX']: + libs += [ 'debugger_ui_util' ] files += [ 'AboutDolphin.cpp', 'ARCodeAddEdit.cpp', Index: Source/Core/DolphinWX/Src/MainNoGUI.cpp =================================================================== --- Source/Core/DolphinWX/Src/MainNoGUI.cpp (revision 3874) +++ Source/Core/DolphinWX/Src/MainNoGUI.cpp (working copy) @@ -27,6 +27,7 @@ #include "Common.h" #include "FileUtil.h" +#include "LogManager.h" #ifdef __APPLE__ #include @@ -111,6 +112,7 @@ void Host_SetWiiMoteConnectionState(int _State) {} +void Host_ShowJitResults (unsigned int address) {} //for cocoa we need to hijack the main to get event #if defined(HAVE_COCOA) && HAVE_COCOA @@ -246,3 +248,4 @@ cmdline_parser_free (&args_info); return(0); } + Index: Source/PluginSpecs/ExportProlog.h =================================================================== --- Source/PluginSpecs/ExportProlog.h (revision 3874) +++ Source/PluginSpecs/ExportProlog.h (working copy) @@ -1,3 +1,4 @@ +#ifndef EXPORT #ifdef _WIN32 #define EXPORT __declspec(dllexport) @@ -9,6 +10,7 @@ #define CALL #endif +#endif // ifndef EXPORT #if defined(__cplusplus) extern "C" { Index: Externals/WiiUseSrc/Src/wiiboard.h =================================================================== --- Externals/WiiUseSrc/Src/wiiboard.h (revision 3874) +++ Externals/WiiUseSrc/Src/wiiboard.h (working copy) @@ -40,11 +40,11 @@ extern "C" { #endif -int wii_board_handshake(struct wiimote_t* wm, struct wii_board_t* wb, byte* data, unsigned short len); +extern int wii_board_handshake(struct wiimote_t* wm, struct wii_board_t* wb, byte* data, unsigned short len); -void wii_board_disconnected(struct wii_board_t* wb); +extern void wii_board_disconnected(struct wii_board_t* wb); -void wii_board_event(struct wii_board_t* wb, byte* msg); +extern void wii_board_event(struct wii_board_t* wb, byte* msg); #ifdef __cplusplus } Index: SConstruct =================================================================== --- SConstruct (revision 3874) +++ SConstruct (working copy) @@ -118,10 +118,17 @@ ignorecase = 2 ), PathVariable('wxconfig', 'Path to the wxconfig', None), - ('CC', 'The c compiler', 'gcc'), - ('CXX', 'The c++ compiler', 'g++'), ) +if sys.platform == 'darwin': + vars.AddVariables( + ('CC', 'The c compiler', 'gcc-4.2'), + ('CXX', 'The c++ compiler', 'g++-4.2') ) +else: + vars.AddVariables( + ('CC', 'The c compiler', 'gcc'), + ('CXX', 'The c++ compiler', 'g++') ) + if sys.platform == 'win32': env = Environment( CPPPATH = include_paths, @@ -269,9 +276,9 @@ env['HAVE_X11'] = 0 env['HAVE_COCOA'] = 1 -else: - env['HAVE_X11'] = conf.CheckPKG('x11') - env['HAVE_COCOA'] = 0 + else: + env['HAVE_X11'] = conf.CheckPKG('x11') + env['HAVE_COCOA'] = 0 # handling wx flags CCFLAGS should be created before wxmods = ['adv', 'core', 'base']