ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure SDL can hijack main() so it can do its initialisation. Only implemented for non-GUI executable so far. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@278 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-08-23 08:42:52 +00:00
parent 19bcb6a21c
commit 0becaa3223
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinWX/src/MainNoGUI.cpp
View File

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

4
Source/Core/DolphinWX/src/SConscript
View File

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