mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-13 03:40:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some additional cleanups.

Browse Source
This commit is contained in:
Themaister 2011-01-09 19:50:23 +01:00
parent 03e1323952
commit 5a599d4cf2
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.win32
View File

@ -1,5 +1,6 @@
TARGET = ssnes.exe TARGET = ssnes.exe
OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o
JOBJ = conf/config_file.o tools/main-stub.o tools/ssnes-joyconfig.o
CC = gcc CC = gcc
CXX = g++ CXX = g++
@ -47,8 +48,10 @@ $(TARGET): $(OBJ)
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
ssnes-joyconfig.exe: conf/config_file.o tools/ssnes-joyconfig.o tools/main-stub.o
$(CC) -o ssnes-joyconfig.exe conf/config_file.o tools/ssnes-joyconfig.o $(SDL_LIBS) -L. -static-libgcc tools/main-stub.o
ssnes-joyconfig.exe: $(JOBJ)
$(CC) -o ssnes-joyconfig.exe $(JOBJ) $(SDL_LIBS) $(LDFLAGS)
clean: clean:
rm -f *.o rm -f *.o

6
tools/ssnes-joyconfig.c
View File

@ -250,18 +250,14 @@ static void parse_input(int argc, char *argv[])
} }
// Windows is being bitchy. // Windows is being bitchy. Cannot include SDL.h with a file that has main() it seems ... It simply won't run at all even with -lSDLmain.
#ifdef _WIN32 #ifdef _WIN32
int real_main(int argc, char *argv[]) int real_main(int argc, char *argv[])
#else #else
int main(int argc, char *argv[]) int main(int argc, char *argv[])
#endif #endif
{ {
fprintf(stderr, "hai\n");
fflush(stderr);
parse_input(argc, argv); parse_input(argc, argv);
fprintf(stderr, "hai\n");
fflush(stderr);
config_file_t *conf = config_file_new(g_in_path); config_file_t *conf = config_file_new(g_in_path);
get_binds(conf, g_player - 1, g_joypad - 1); get_binds(conf, g_player - 1, g_joypad - 1);