summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/configure2
-rw-r--r--uisimulator/sdl/uisdl.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/configure b/tools/configure
index b7932be13f..f9ef9803e2 100755
--- a/tools/configure
+++ b/tools/configure
@@ -111,7 +111,7 @@ simcc () {
111 elif [ "$simver" = "sdl" ]; then 111 elif [ "$simver" = "sdl" ]; then
112 # sdl version 112 # sdl version
113 GCCOPTS="$GCCOPTS `sdl-config --cflags`" 113 GCCOPTS="$GCCOPTS `sdl-config --cflags`"
114 LDOPTS="`sdl-config --libs`" 114 LDOPTS="`sdl-config --libs` -mconsole"
115 checksoundcard 115 checksoundcard
116 else 116 else
117 # x11 version 117 # x11 version
diff --git a/uisimulator/sdl/uisdl.c b/uisimulator/sdl/uisdl.c
index 8c9d216f10..d298167df1 100644
--- a/uisimulator/sdl/uisdl.c
+++ b/uisimulator/sdl/uisdl.c
@@ -187,6 +187,11 @@ int sim_app_main(void *param)
187 return 0; 187 return 0;
188} 188}
189 189
190#if defined(WIN32) && defined(main)
191/* Don't use SDL_main on windows -> no more stdio redirection */
192#undef main
193#endif
194
190int main(int argc, char *argv[]) 195int main(int argc, char *argv[])
191{ 196{
192 if (argc >= 1) { 197 if (argc >= 1) {