chocolate-doom · WinterMute · Jun 16, 2018 · Jun 21, 2018 · Jun 20, 2018 · Jun 21, 2018
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,8 @@ GPATH
 GRTAGS
 GTAGS
 /HTML/
+
+# Nintendo Switch binaries
+*.nro
+*.nacp
+
diff --git a/.travis.yml b/.travis.yml
@@ -27,4 +27,5 @@ branches:
     only:
     - master
     - sdl2-branch
+    - switch-port
 
diff --git a/configure.ac b/configure.ac
@@ -102,6 +102,11 @@ case "$host" in
     ;;
 esac
 
+dnl - platform, for use with game console ports
+AC_ARG_WITH([platform],
+  AC_HELP_STRING([--with-platform],[build for specific platform]),
+  [], [with_platform=default])
+
 AC_CHECK_TOOL(OBJDUMP, objdump, )
 AC_CHECK_TOOL(STRIP, strip, )
 
@@ -111,9 +116,18 @@ AS_IF([test "x$enable_werror" = "xyes"], [
         CFLAGS="$CFLAGS -Werror"
 ])
 
+AS_IF([test "x$with_platform" = "xswitch"], [
+        CFLAGS="-fPIC -march=armv8-a -mtune=cortex-a57 -mtp=soft -ftls-model=local-exec $CFLAGS"
+        CPPFLAGS="-D__SWITCH__ $CPPFLAGS -isystem /opt/devkitpro/libnx/include"
+        LIBS="$LIBS -L/opt/devkitpro/libnx/lib -lnx -lm"
+        LDFLAGS="-fPIE -specs=/opt/devkitpro/libnx/switch.specs"
+])
+
 AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")
 AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON)
 
+AM_CONDITIONAL(BUILD_SWITCH, [test "$with_platform" = "switch"])
+
 dnl Automake v1.8.0 is required, please upgrade!
 
 AM_INIT_AUTOMAKE([1.8.0 foreign])

diff --git a/data/Makefile.am b/data/Makefile.am
@@ -3,6 +3,7 @@ EXTRA_DIST=              \
         README           \
         doom.ico         \
         doom8.ico        \
+        doom.jpg         \
         doom.png         \
         setup.ico        \
         setup8.ico       \

diff --git a/data/doom.jpg b/data/doom.jpg
diff --git a/opl/examples/Makefile.am b/opl/examples/Makefile.am
@@ -3,6 +3,6 @@ AM_CFLAGS = -I$(top_srcdir)/opl
 
 noinst_PROGRAMS=droplay
 
-droplay_LDADD = ../libopl.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@
+droplay_LDADD = ../libopl.a @SDL_LIBS@ @SDLMIXER_LIBS@
 droplay_SOURCES = droplay.c
 
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -9,15 +9,20 @@ execgames_PROGRAMS = @PROGRAM_PREFIX@doom     \
                      @PROGRAM_PREFIX@strife   \
                      @PROGRAM_PREFIX@server
 
+if BUILD_SWITCH
+
+else
+
 noinst_PROGRAMS = @PROGRAM_PREFIX@setup
 
 SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup$(EXEEXT)    \
                  @PROGRAM_PREFIX@heretic-setup$(EXEEXT) \
                  @PROGRAM_PREFIX@hexen-setup$(EXEEXT)   \
                  @PROGRAM_PREFIX@strife-setup$(EXEEXT)
-
 execgames_SCRIPTS = $(SETUP_BINARIES)
 
+endif
+
 AM_CFLAGS = -I$(top_srcdir)/textscreen            \
             -I$(top_srcdir)/opl                   \
             -I$(top_srcdir)/pcsound               \
@@ -48,7 +53,7 @@ net_structrw.c       net_structrw.h        \
 z_native.c           z_zone.h
 
 @PROGRAM_PREFIX@server_SOURCES=$(COMMON_SOURCE_FILES) $(DEDSERV_FILES)
-@PROGRAM_PREFIX@server_LDADD = @LDFLAGS@ @SDLNET_LIBS@
+@PROGRAM_PREFIX@server_LDADD = @SDLNET_LIBS@
 
 # Source files used by the game binaries (chocolate-doom, etc.)
 
@@ -128,10 +133,11 @@ EXTRA_LIBS =                                               \
                $(top_builddir)/textscreen/libtextscreen.a  \
                $(top_builddir)/pcsound/libpcsound.a        \
                $(top_builddir)/opl/libopl.a                \
-               @LDFLAGS@                                   \
+               @PNG_LIBS@                                  \
                @SDL_LIBS@                                  \
                @SDLMIXER_LIBS@                             \
-               @SDLNET_LIBS@
+               @SDLNET_LIBS@                               \
+               @SAMPLERATE_LIBS@
 
 if HAVE_WINDRES
 @PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) resource.rc
@@ -198,6 +204,9 @@ net_query.c          net_query.h           \
 net_structrw.c       net_structrw.h        \
 z_native.c           z_zone.h
 
+if BUILD_SWITCH
+
+else
 if HAVE_WINDRES
 @PROGRAM_PREFIX@setup_SOURCES=$(SETUP_FILES) $(COMMON_SOURCE_FILES) setup-res.rc
 else
@@ -206,6 +215,7 @@ endif
 @PROGRAM_PREFIX@setup_LDADD = setup/libsetup.a                             \
                         $(top_builddir)/textscreen/libtextscreen.a   \
                         @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@
+endif
 
 EXTRA_DIST =                        \
         CMakeLists.txt              \
@@ -279,3 +289,26 @@ mus2mid : $(MUS2MID_SRC_FILES)
 	$(CC) -DSTANDALONE -I$(top_builddir) $(CFLAGS) @LDFLAGS@ \
               $(MUS2MID_SRC_FILES) -o $@
 
+if BUILD_SWITCH
+all-local: @PROGRAM_PREFIX@doom.nro \
+	@PROGRAM_PREFIX@heretic.nro \
+	@PROGRAM_PREFIX@hexen.nro \
+	@PROGRAM_PREFIX@strife.nro
+
+@PROGRAM_PREFIX@doom.nro: @PROGRAM_PREFIX@doom @PROGRAM_PREFIX@doom.nacp
+	elf2nro @PROGRAM_PREFIX@doom $@ --nacp=@PROGRAM_PREFIX@doom.nacp --icon=$(top_srcdir)/data/doom.jpg
+
+@PROGRAM_PREFIX@heretic.nro: @PROGRAM_PREFIX@heretic @PROGRAM_PREFIX@heretic.nacp
+	elf2nro @PROGRAM_PREFIX@heretic $@ --nacp=@PROGRAM_PREFIX@heretic.nacp
+
+@PROGRAM_PREFIX@hexen.nro: @PROGRAM_PREFIX@hexen @PROGRAM_PREFIX@hexen.nacp
+	elf2nro @PROGRAM_PREFIX@hexen $@ --nacp=@PROGRAM_PREFIX@hexen.nacp
+
+@PROGRAM_PREFIX@strife.nro: @PROGRAM_PREFIX@strife @PROGRAM_PREFIX@strife.nacp
+	elf2nro @PROGRAM_PREFIX@strife $@ --nacp=@PROGRAM_PREFIX@strife.nacp
+
+%.nacp: $(MAKEFILE_LIST)
+	nacptool --create "$*" "SwitchBrew Team" "$(VERSION)" $@
+
+
+endif
diff --git a/src/i_joystick.c b/src/i_joystick.c
@@ -41,8 +41,12 @@ static SDL_Joystick *joystick = NULL;
 // Configuration variables:
 
 // Standard default.cfg Joystick enable/disable
-
+// always enable on Switch
+#ifdef __SWITCH__
+static int usejoystick = 1;
+#else
 static int usejoystick = 0;
+#endif
 
 // SDL GUID and index of the joystick to use.
 static char *joystick_guid = "";

diff --git a/src/i_video.c b/src/i_video.c
@@ -406,9 +406,67 @@ static void I_ToggleFullScreen(void)
     }
 }
 
+extern void I_HandleKeyboardEvent(SDL_Event *sdlevent);
+
+struct EventMap {
+        int button;
+        SDL_Keycode sym;
+        SDL_Scancode scan;
+};
+
+void sendKeypress(SDL_Event *ev, int sym, int scancode) {
+    SDL_Event ev_new;
+    memset(&ev_new, 0, sizeof(SDL_Event));
+    ev_new.key.keysym.sym = sym;
+    ev_new.key.keysym.scancode = scancode;
+    if (ev->type == SDL_JOYBUTTONDOWN) {
+        ev_new.type = ev_new.key.type = SDL_KEYDOWN;
+        ev_new.key.state = SDL_PRESSED;
+    } else if (ev->type == SDL_JOYBUTTONUP) {
+        ev_new.type = ev_new.key.type = SDL_KEYUP;
+        ev_new.key.state = SDL_RELEASED;
+    }
+
+    I_HandleKeyboardEvent(&ev_new);
+}
+
+void TranslateEvent(SDL_Event *ev, const struct EventMap *btnmap, int btnmaps) {
+
+    int i;
+
+    for (i=0; i<btnmaps; i++ ) {
+        if (btnmap[i].button == ev->jbutton.button ) break;
+    }
+
+    if (i != btnmaps) {
+        sendKeypress(ev,btnmap[i].sym, btnmap[i].scan);
+    }
+}
+
+extern boolean askforquit __attribute__((weak));
+extern int messageToPrint __attribute__((weak));
+
+static void TranslateJoystickEvent(SDL_Event *ev) {
+    static const struct EventMap menu_btnmap[] = {
+        { 0, SDLK_RETURN, SDL_SCANCODE_RETURN },        // A Button
+        { 13, SDLK_UP, SDL_SCANCODE_UP },               // Up
+        { 15, SDLK_DOWN, SDL_SCANCODE_DOWN },           // Down
+        { 12, SDLK_LEFT, SDL_SCANCODE_LEFT },           // Left
+        { 14, SDLK_RIGHT, SDL_SCANCODE_RIGHT },         // Right
+        { 11, SDLK_ESCAPE, SDL_SCANCODE_ESCAPE },       // -
+        { 1,  SDLK_BACKSPACE, SDL_SCANCODE_BACKSPACE }, // B
+    };
+
+    if ( (&askforquit && askforquit) || (&messageToPrint && messageToPrint)) {
+        int btn = ev->jbutton.button;
+        if (btn == 3) sendKeypress(ev, SDLK_y, SDL_SCANCODE_Y);
+        if (btn == 1) sendKeypress(ev, SDLK_n, SDL_SCANCODE_N);
+    }
+    TranslateEvent(ev, menu_btnmap, sizeof(menu_btnmap)/sizeof(menu_btnmap[0]));
+}
+
 void I_GetEvent(void)
 {
-    extern void I_HandleKeyboardEvent(SDL_Event *sdlevent);
     extern void I_HandleMouseEvent(SDL_Event *sdlevent);
     SDL_Event sdlevent;
 
@@ -438,7 +496,12 @@ void I_GetEvent(void)
                     I_HandleMouseEvent(&sdlevent);
                 }
                 break;
-
+            // Translate some gamepad events to keys to allow menu navigation
+            // in games that don't support joystick menu controls (Heretic, Hexen)
+            case SDL_JOYBUTTONDOWN:
+            case SDL_JOYBUTTONUP:
+                TranslateJoystickEvent(&sdlevent);
+                break;
             case SDL_QUIT:
                 if (screensaver_mode)
                 {

diff --git a/src/m_config.c b/src/m_config.c
@@ -2163,6 +2163,7 @@ float M_GetFloatVariable(const char *name)
 
 static char *GetDefaultConfigDir(void)
 {
+#ifndef __SWITCH__
 #if !defined(_WIN32) || defined(_WIN32_WCE)
 
     // Configuration settings are stored in an OS-appropriate path
@@ -2175,6 +2176,7 @@ static char *GetDefaultConfigDir(void)
     result = SDL_GetPrefPath("", PACKAGE_TARNAME);
     return result;
 #endif /* #ifndef _WIN32 */
+#endif /* #ifndef __SWITCH__ */
     return M_StringDuplicate("");
 }
 
@@ -2201,11 +2203,11 @@ void M_SetConfigDir(const char *dir)
     if (strcmp(configdir, "") != 0)
     {
         printf("Using %s for configuration and saves\n", configdir);
-    }
+        // Make the directory if it doesn't already exist:
 
-    // Make the directory if it doesn't already exist:
+        M_MakeDirectory(configdir);
+    }
 
-    M_MakeDirectory(configdir);
 }
 
 //

diff --git a/src/m_misc.c b/src/m_misc.c
@@ -248,6 +248,8 @@ char *M_TempFile(const char *s)
     {
         tempdir = ".";
     }
+#elif defined(__SWITCH__)
+    tempdir = ".";
 #else
     // In Unix, just use /tmp.
 

diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am
@@ -5,7 +5,12 @@ CTAGS_ARGS=-I TXT_UNCAST_ARG+
 
 # build this directory before the examples directory.
 
-SUBDIRS = fonts . examples
+SUBDIRS = fonts .
+
+if BUILD_SWITCH
+else
+SUBDIRS += examples
+endif
 
 noinst_LIBRARIES=libtextscreen.a
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,3 +52,8 @@ GPATH @@
     GRTAGS
     GTAGS
     /HTML/
+    # Nintendo Switch binaries
+    *.nro
+    *.nacp