Update Win32 makefile

This commit is contained in:
Themaister 2011-01-09 17:24:13 +01:00
parent 1e9decfa5c
commit 43316083d7
2 changed files with 10 additions and 4 deletions

View File

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

View File

@ -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;
}