From 823ceb79c0c3c9ef219c26aecb4d6f93c484829b Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Sun, 24 Jan 2021 15:57:29 -0330 Subject: [PATCH] Added patches from Debian build (too bad I didn't see these about 6 hours ago). Bumped version number, to start work on 6.6. --- src/common/Version.hxx | 2 +- src/emucore/Settings.cxx | 2 +- src/tools/evdev-joystick/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/Version.hxx b/src/common/Version.hxx index b36265e6f..ac5dcc107 100644 --- a/src/common/Version.hxx +++ b/src/common/Version.hxx @@ -18,7 +18,7 @@ #ifndef VERSION_HXX #define VERSION_HXX -#define STELLA_VERSION "6.5.1" +#define STELLA_VERSION "6.6_pre" #define STELLA_BUILD "6699" #endif diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx index bbd1b24b3..ebd34a1ca 100644 --- a/src/emucore/Settings.cxx +++ b/src/emucore/Settings.cxx @@ -513,7 +513,7 @@ void Settings::usage() const << " -autofirerate <0-30> Set fire button's autofire rate (0 means off)\n" << " -saport How to assign virtual ports to multiple\n" << " Stelladaptor/2600-daptors\n" - << " -modcombo <1|0> Enable modifer key combos\n" + << " -modcombo <1|0> Enable modifier key combos\n" << " (Control-Q for quit may not work when disabled!)\n" << " -fastscbios <1|0> Disable Supercharger BIOS progress loading bars\n" << " -threads <1|0> Whether to using multi-threading during\n" diff --git a/src/tools/evdev-joystick/Makefile b/src/tools/evdev-joystick/Makefile index 32864e921..60d2c0e04 100644 --- a/src/tools/evdev-joystick/Makefile +++ b/src/tools/evdev-joystick/Makefile @@ -1,7 +1,7 @@ all : evdev-joystick evdev-joystick: evdev-joystick.c - $(CC) -Wall -O2 -o evdev-joystick evdev-joystick.c + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o evdev-joystick evdev-joystick.c install: evdev-joystick 80-stelladaptor-joystick.rules install -s evdev-joystick /usr/local/bin/