diff --git a/Makefile.win32 b/Makefile.win32 index 780be6db83..b1c37060ff 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -1,4 +1,5 @@ TARGET = ssnes.exe +JTARGET = ssnes-joyconfig.exe OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o message.o JOBJ = conf/config_file.o tools/main-stub.o tools/ssnes-joyconfig.o @@ -55,7 +56,7 @@ endif CFLAGS = -Wall -O3 -std=gnu99 -I. -all: $(TARGET) ssnes-joyconfig.exe +all: $(TARGET) $(JTARGET) $(TARGET): $(OBJ) $(Q)$(CXX) -o $@ $(OBJ) $(LIBS) $(LDFLAGS) @@ -65,8 +66,8 @@ $(TARGET): $(OBJ) $(Q)$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< @$(if $(Q), $(shell echo echo CC $<),) -ssnes-joyconfig.exe: $(JOBJ) - $(Q)$(CC) -o ssnes-joyconfig.exe $(JOBJ) $(SDL_LIBS) $(LDFLAGS) +$(JTARGET): $(JOBJ) + $(Q)$(CC) -o $@ $(JOBJ) $(SDL_LIBS) $(LDFLAGS) @$(if $(Q), $(shell echo echo LD $@),) clean: @@ -83,7 +84,7 @@ clean: 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 freetype6.dll ssnes-joyconfig.exe + zip -r ssnes-win32-0.2.zip $(TARGET) ssnes.cfg snes.dll libxml2.dll iconv.dll zlib1.dll SDL.dll libsamplerate-0.dll freetype6.dll $(JTARGET) libs: wget https://github.com/downloads/Themaister/SSNES/SSNES-win32-libs.zip --no-check-certificate diff --git a/qb/config.params.sh b/qb/config.params.sh index a297bf01fd..3ec159eca2 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -1,7 +1,7 @@ . qb/qb.params.sh PACKAGE_NAME=ssnes -PACKAGE_VERSION=0.1 +PACKAGE_VERSION=0.2 # Adds a command line opt to ./configure --help # $1: Variable (HAVE_ALSA, HAVE_OSS, etc) diff --git a/ssnes.c b/ssnes.c index 8db561d207..4f8451658b 100644 --- a/ssnes.c +++ b/ssnes.c @@ -240,11 +240,15 @@ static void fill_pathname(char *out_path, char *in_path, const char *replace) #define SSNES_DEFAULT_CONF_PATH_STR " Defaults to $XDG_CONFIG_HOME/ssnes/ssnes.cfg" #endif +#ifdef _WIN32 +#define PACKAGE_VERSION "0.2" +#endif + static void print_help(void) { - puts("================================================="); - puts("ssnes: Simple Super Nintendo Emulator (libsnes)"); - puts("================================================="); + puts("============================================================="); + puts("ssnes: Simple Super Nintendo Emulator (libsnes) -- v" PACKAGE_VERSION " --"); + puts("============================================================="); puts("Usage: ssnes [rom file] [-h/--help | -c/--config | -v/--verbose | -4/--multitap | -j/--justifier | -J/--justifiers | -S/--savestate | -m/--mouse | -g/--gameboy | -b/--bsx | -B/--bsxslot | --sufamiA | --sufamiB | -p/--scope | -s/--save" FFMPEG_HELP_QUARK "]"); puts("\t-h/--help: Show this help message"); puts("\t-s/--save: Path for save file (*.srm). Required when rom is input from stdin");