From 43316083d79f07d1983e89777a1a093446206426 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sun, 9 Jan 2011 17:24:13 +0100
Subject: [PATCH] Update Win32 makefile

---
 Makefile.win32          | 9 +++++----
 tools/ssnes-joyconfig.c | 5 +++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile.win32 b/Makefile.win32
index 531eb189e4..b3f4c282fa 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -14,7 +14,7 @@ DEFINES = -I.
 LDFLAGS = -L. -static-libgcc -s
 
 SRC_LIBS = -lsamplerate-0
-SDL_LIBS = -lSDLmain -lSDL
+SDL_LIBS = -lmingw32 -lSDLmain -lSDL
 SDL_CFLAGS = -ISDL
 
 ifeq ($(HAVE_SRC), 1)
@@ -43,12 +43,13 @@ all: $(TARGET) ssnes-joyconfig.exe
 $(TARGET): $(OBJ)
 	$(CXX) -o $@ $(OBJ) $(LIBS) $(LDFLAGS)
 
-ssnes-joyconfig.exe: conf/config_file.o tools/ssnes-joyconfig.o
-	$(CC) -o ssnes-joyconfig.exe $(SDL_LIBS) $(LDFLAGS) conf/config_file.o tools/ssnes-joyconfig.o
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
 
+ssnes-joyconfig.exe: conf/config_file.o tools/ssnes-joyconfig.o
+	$(CC) -o ssnes-joyconfig.exe conf/config_file.o tools/ssnes-joyconfig.o $(SDL_LIBS)
+
 clean:
 	rm -f *.o 
 	rm -f audio/*.o
@@ -59,7 +60,7 @@ clean:
 	rm -f hqflt/snes_ntsc/*.o
 	rm -f $(TARGET)
 	rm -f ssnes-joyconfig.exe
-	rm -f tools/*
+	rm -f tools/*.o
 
 dist: all
 	zip -r ssnes-win32.zip $(TARGET) ssnes.cfg snes.dll libxml2.dll iconv.dll zlib1.dll SDL.dll libsamplerate-0.dll ssnes-joyconfig.exe
diff --git a/tools/ssnes-joyconfig.c b/tools/ssnes-joyconfig.c
index bba3d1d455..5305729a54 100644
--- a/tools/ssnes-joyconfig.c
+++ b/tools/ssnes-joyconfig.c
@@ -252,7 +252,11 @@ static void parse_input(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
+   fprintf(stderr, "hai\n");
+   fflush(stderr);
    parse_input(argc, argv);
+   fprintf(stderr, "hai\n");
+   fflush(stderr);
 
    config_file_t *conf = config_file_new(g_in_path);
    get_binds(conf, g_player - 1, g_joypad - 1);
@@ -262,4 +266,5 @@ int main(int argc, char *argv[])
       free(g_in_path);
    if (g_out_path)
       free(g_out_path);
+   return 0;
 }