diff --git a/Source/Core/DolphinWX/src/MainNoGUI.cpp b/Source/Core/DolphinWX/src/MainNoGUI.cpp index 3822785fb6..76b2341c79 100644 --- a/Source/Core/DolphinWX/src/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/src/MainNoGUI.cpp @@ -56,7 +56,10 @@ void Host_CloseDisplay(){} void Host_UpdateStatusBar(const char* _pText){} -int main(int argc, const char* argv[]) +// Include SDL header so it can hijack main(). +#include "SDL.h" + +int main(int argc, char* argv[]) { if (argc != 2) { diff --git a/Source/Core/DolphinWX/src/SConscript b/Source/Core/DolphinWX/src/SConscript index 4f5dabf0b9..e029e5aaee 100644 --- a/Source/Core/DolphinWX/src/SConscript +++ b/Source/Core/DolphinWX/src/SConscript @@ -18,8 +18,8 @@ files = ["BootManager.cpp", ] -wxenv = env.Copy(CXXFLAGS = "`wx-config --cppflags` -DUSE_XPM_BITMAPS -DwxNEEDS_CHARPP", - LINKFLAGS = "-L/usr/local/lib -pthread `wx-config --libs`") +wxenv = env.Copy(CXXFLAGS = "`wx-config --cppflags` -DUSE_XPM_BITMAPS -DwxNEEDS_CHARPP `sdl-config --cflags`", + LINKFLAGS = "-L/usr/local/lib -pthread `wx-config --libs` `sdl-config --libs`") if sys.platform == 'darwin': icon = 'Dolphin'