Merge branch 'master' of https://github.com/chocolate-doom/chocolate-…

…doom
fabiangreffrath · Aug 12, 2022 · de76af5 · de76af5 · rfomin · Aug 13, 2022
2 parents 3e63b11 + d18f5fc
commit de76af5
Show file tree

Hide file tree

Showing 35 changed files with 372 additions and 65 deletions.
diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml
@@ -6,6 +6,8 @@ on:
   pull_request:
     types: [opened, reopened, synchronize]
   push:
+    branches:
+      - master
 
 jobs:
   cpp-linter:
@@ -26,6 +28,7 @@ jobs:
         with:
           style: file
           lines-changed-only: true
+          version: 14
           tidy-checks: >-
             boost-*
             ,bugprone-*
@@ -40,4 +43,5 @@ jobs:
 
       - name: Fail fast?!
         if: steps.linter.outputs.checks-failed > 0
-        run: exit 1
+        run: |
+          echo "Some files failed the linting checks! Fail fast disabled until false posivite issue is fixed"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,9 +28,21 @@ else()
                         "-Wredundant-decls")
 endif()
 
+option(ENABLE_SDL2_NET "Enable SDL2_net" On)
+option(ENABLE_SDL2_MIXER "Enable SDL2_mixer" On)
+
 find_package(SDL2 2.0.7)
-find_package(SDL2_mixer 2.0.2)
-find_package(SDL2_net 2.0.0)
+if(ENABLE_SDL2_MIXER)
+    find_package(SDL2_mixer 2.0.2)
+else()
+    add_compile_definitions(DISABLE_SDL2MIXER=1)
+endif()
+
+if(ENABLE_SDL2_NET)
+    find_package(SDL2_net 2.0.0)
+else()
+    add_compile_definitions(DISABLE_SDL2NET=1)
+endif()
 
 option(CRISPY_TRUECOLOR "True color rendering" OFF)
 

diff --git a/configure.ac b/configure.ac
@@ -32,8 +32,23 @@ then
 fi
 
 PKG_CHECK_MODULES(SDL, [sdl2 >= 2.0.7])
-PKG_CHECK_MODULES(SDLMIXER, [SDL2_mixer >= 2.0.2])
-PKG_CHECK_MODULES(SDLNET, [SDL2_net >= 2.0.0])
+# Check for SDL2_mixer
+AC_ARG_ENABLE([sdl2mixer],
+AS_HELP_STRING([--disable-sdl2mixer], [Disable SDL2_mixer support])
+)
+AS_IF([test "x$enable_sdl2mixer" != xno], [
+    PKG_CHECK_MODULES(SDLMIXER, [SDL2_mixer >= 2.0.2])], [
+    AC_DEFINE([DISABLE_SDL2MIXER], [1], [SDL2_mixer disabled])
+])
+
+# Check for networking
+AC_ARG_ENABLE([sdl2net],
+AS_HELP_STRING([--disable-sdl2net], [Disable SDL2_net support])
+)
+AS_IF([test "x$enable_sdl2net" != xno], [
+    PKG_CHECK_MODULES(SDLNET, [SDL2_net >= 2.0.0])], [
+    AC_DEFINE([DISABLE_SDL2NET], [1], [SDL2_net disabled])
+])
 
 # Check for bash-completion.
 AC_ARG_ENABLE([bash-completion],

diff --git a/data/Makefile.am b/data/Makefile.am
@@ -2,11 +2,10 @@
 EXTRA_DIST=              \
         README           \
         doom.ico         \
-        doom8.ico        \
         doom.png         \
         setup.ico        \
-        setup8.ico       \
         setup.png        \
+        wadfile.png      \
         convert-icon
 
 iconsdir = $(prefix)/share/icons/hicolor/128x128/apps

diff --git a/data/doom8.ico b/data/doom8.ico
diff --git a/data/setup8.ico b/data/setup8.ico
diff --git a/data/wadfile.png b/data/wadfile.png
diff --git a/opl/CMakeLists.txt b/opl/CMakeLists.txt
@@ -12,4 +12,7 @@ add_library(opl STATIC
 target_include_directories(opl
                            INTERFACE "."
                            PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
-target_link_libraries(opl SDL2::mixer)
+target_link_libraries(opl SDL2::SDL2)
+if(ENABLE_SDL2_mixer)
+    target_link_libraries(opl SDL2::mixer)
+endif()
diff --git a/opl/opl.c b/opl/opl.c
@@ -50,7 +50,9 @@ static opl_driver_t *drivers[] =
 #ifdef _WIN32
     &opl_win32_driver,
 #endif
+#ifndef DISABLE_SDL2MIXER
     &opl_sdl_driver,
+#endif // DISABLE_SDL2MIXER
     NULL
 };
 
@@ -110,7 +112,7 @@ static opl_init_result_t AutoSelectDriver(unsigned int port_base)
     int i;
     opl_init_result_t result;
 
-    for (i=0; drivers[i] != NULL; ++i)
+    for (i = 0; drivers[i] != NULL; ++i)
     {
         result = InitDriver(drivers[i], port_base);
         if (result != OPL_INIT_NONE)

diff --git a/opl/opl_sdl.c b/opl/opl_sdl.c
@@ -33,6 +33,10 @@
 
 #include "opl_queue.h"
 
+
+#ifndef DISABLE_SDL2MIXER
+
+
 #define MAX_SOUND_SLICE_TIME 100 /* ms */
 
 typedef struct
@@ -511,3 +515,5 @@ opl_driver_t opl_sdl_driver =
     OPL_SDL_AdjustCallbacks,
 };
 
+
+#endif // DISABLE_SDL2MIXER
diff --git a/pcsound/CMakeLists.txt b/pcsound/CMakeLists.txt
@@ -8,4 +8,7 @@ add_library(pcsound STATIC
 target_include_directories(pcsound
                            INTERFACE "."
                            PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
-target_link_libraries(pcsound SDL2::mixer)
+target_link_libraries(pcsound SDL2::SDL2)
+if(ENABLE_SDL2_mixer)
+    target_link_libraries(pcsound SDL2::mixer)
+endif()
diff --git a/pcsound/pcsound.c b/pcsound/pcsound.c
@@ -56,7 +56,9 @@ static pcsound_driver_t *drivers[] =
 #ifdef _WIN32
     &pcsound_win32_driver,
 #endif
+#ifndef DISABLE_SDL2MIXER
     &pcsound_sdl_driver,
+#endif // DISABLE_SDL2MIXER
     NULL,
 };
 

diff --git a/pcsound/pcsound_sdl.c b/pcsound/pcsound_sdl.c
@@ -24,6 +24,10 @@
 #include "pcsound.h"
 #include "pcsound_internal.h"
 
+
+#ifndef DISABLE_SDL2MIXER
+
+
 #define MAX_SOUND_SLICE_TIME 70 /* ms */
 #define SQUARE_WAVE_AMP 0x2000
 
@@ -248,3 +252,5 @@ pcsound_driver_t pcsound_sdl_driver =
     PCSound_SDL_Shutdown,
 };
 
+
+#endif // DISABLE_SDL2MIXER
diff --git a/pkg/Makefile.am b/pkg/Makefile.am
@@ -1,10 +1,6 @@
 
 OSX_FILES=                                                              \
-osx/Resources/128x128.png                                               \
-osx/Resources/app.icns                                                  \
 osx/Resources/app.png                                                   \
-osx/Resources/wadfile.icns                                              \
-osx/Resources/wadfile.png                                               \
 osx/Resources/launcher.nib/designable.nib                               \
 osx/Resources/launcher.nib/keyedobjects.nib                             \
 osx/disk/dir.DS_Store                                                   \

diff --git a/pkg/osx/.gitignore b/pkg/osx/.gitignore
@@ -1,4 +1,8 @@
 Info.plist
+app.iconset
+app.icns
+wadfile.iconset
+wadfile.icns
 launcher
 *.o
 *.d

diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile
@@ -37,12 +37,14 @@ SRC_INFO_PLIST=Info.plist
 APP_DOC_DIR=$(APP_BIN_DIR)/Documentation
 APP_DOC_RELDIR=$(patsubst $(STAGING_DIR)/%,%,$(APP_DOC_DIR))
 
-$(STAGING_DIR): launcher $(TOPLEVEL_DOCS)
+$(STAGING_DIR): launcher $(TOPLEVEL_DOCS) app.icns wadfile.icns
 	rm -rf $(STAGING_DIR)
 	mkdir $(STAGING_DIR)
 
 	mkdir -p "$(APP_TOP_DIR)"
 	cp -R Resources "$(APP_TOP_DIR)"
+	cp app.icns wadfile.icns "$(APP_TOP_DIR)/Resources"
+	cp $(TOPLEVEL)/data/doom.png "$(APP_TOP_DIR)/Resources/128x128.png"
 	cp PkgInfo "$(APP_TOP_DIR)"
 	cp $(SRC_INFO_PLIST) "$(APP_TOP_DIR)"
 
@@ -86,9 +88,20 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS)
 	cp disk/dir.DS_Store $(STAGING_DIR)/.DS_Store
 	cp disk/background.png $(STAGING_DIR)/background.png
 
+app.icns: $(TOPLEVEL)/data/doom.png
+	mkdir -p app.iconset
+	sips -z 64 64 $< --out app.iconset/icon_32x32@2x.png
+	iconutil -c icns app.iconset
+
+wadfile.icns: $(TOPLEVEL)/data/wadfile.png
+	mkdir -p wadfile.iconset
+	sips -z 64 64 $< --out wadfile.iconset/icon_32x32@2x.png
+	iconutil -c icns wadfile.iconset
+
 clean : launcher_clean
 	rm -f $(DMG)
 	rm -rf $(STAGING_DIR)
+	rm -rf app.icns app.iconset wadfile.icns wadfile.iconset
 
 # Launcher build:
 CFLAGS = -Wall -I$(TOPLEVEL)

diff --git a/pkg/osx/Resources/128x128.png b/pkg/osx/Resources/128x128.png
diff --git a/pkg/osx/Resources/app.icns b/pkg/osx/Resources/app.icns
diff --git a/pkg/osx/Resources/wadfile.icns b/pkg/osx/Resources/wadfile.icns
diff --git a/pkg/osx/Resources/wadfile.png b/pkg/osx/Resources/wadfile.png
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -33,7 +33,10 @@ set(DEDSERV_FILES
 add_executable("${PROGRAM_PREFIX}server" WIN32 ${COMMON_SOURCE_FILES} ${DEDSERV_FILES})
 target_include_directories("${PROGRAM_PREFIX}server"
                            PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
-target_link_libraries("${PROGRAM_PREFIX}server" SDL2::SDL2main SDL2::net)
+target_link_libraries("${PROGRAM_PREFIX}server" SDL2::SDL2main SDL2::SDL2)
+if(ENABLE_SDL2_NET)
+    target_link_libraries("${PROGRAM_PREFIX}server" SDL2::net)
+endif()
 
 # Source files used by the game binaries (chocolate-doom, etc.)
 
@@ -124,7 +127,13 @@ set(DEHACKED_SOURCE_FILES
 set(SOURCE_FILES ${COMMON_SOURCE_FILES} ${GAME_SOURCE_FILES})
 set(SOURCE_FILES_WITH_DEH ${SOURCE_FILES} ${DEHACKED_SOURCE_FILES})
 
-set(EXTRA_LIBS SDL2::SDL2main SDL2::SDL2 SDL2::mixer SDL2::net textscreen pcsound opl)
+set(EXTRA_LIBS SDL2::SDL2main SDL2::SDL2 textscreen pcsound opl)
+if(ENABLE_SDL2_MIXER)
+    list(APPEND EXTRA_LIBS SDL2::mixer)
+endif()
+if(ENABLE_SDL2_NET)
+    list(APPEND EXTRA_LIBS SDL2::net)
+endif()
 if(SAMPLERATE_FOUND)
     list(APPEND EXTRA_LIBS samplerate::samplerate)
 endif()
@@ -216,7 +225,13 @@ endif()
 
 target_include_directories("${PROGRAM_PREFIX}setup"
                            PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
-target_link_libraries("${PROGRAM_PREFIX}setup" SDL2::SDL2main SDL2::SDL2 SDL2::mixer SDL2::net setup textscreen)
+target_link_libraries("${PROGRAM_PREFIX}setup" SDL2::SDL2main SDL2::SDL2 setup textscreen)
+if(ENABLE_SDL2_mixer)
+    target_link_libraries("${PROGRAM_PREFIX}setup" SDL2::mixer)
+endif()
+if(ENABLE_SDL2_NET)
+    target_link_libraries("${PROGRAM_PREFIX}setup" SDL2::net)
+endif()
 
 if(MSVC)
     set_target_properties("${PROGRAM_PREFIX}setup" PROPERTIES

diff --git a/src/doom/CMakeLists.txt b/src/doom/CMakeLists.txt
@@ -82,4 +82,10 @@ add_library(doom STATIC
             wi_stuff.c      wi_stuff.h)
 
 target_include_directories(doom PRIVATE "../" "${CMAKE_CURRENT_BINARY_DIR}/../../")
-target_link_libraries(doom SDL2::SDL2 SDL2::mixer SDL2::net)
+target_link_libraries(doom SDL2::SDL2)
+if(ENABLE_SDL2_mixer)
+    target_link_libraries(doom SDL2::mixer)
+endif()
+if(ENABLE_SDL2_NET)
+    target_link_libraries(doom SDL2::net)
+endif()
diff --git a/src/heretic/CMakeLists.txt b/src/heretic/CMakeLists.txt
@@ -55,4 +55,10 @@ add_library(heretic STATIC
             s_sound.c           s_sound.h)
 
 target_include_directories(heretic PRIVATE "../" "${CMAKE_CURRENT_BINARY_DIR}/../../")
-target_link_libraries(heretic textscreen SDL2::SDL2 SDL2::mixer SDL2::net)
+target_link_libraries(heretic textscreen SDL2::SDL2)
+if(ENABLE_SDL2_mixer)
+    target_link_libraries(heretic SDL2::mixer)
+endif()
+if(ENABLE_SDL2_NET)
+    target_link_libraries(heretic SDL2::net)
+endif()
diff --git a/src/hexen/CMakeLists.txt b/src/hexen/CMakeLists.txt
@@ -56,4 +56,10 @@ add_library(hexen STATIC
                                 xddefs.h)
 
 target_include_directories(hexen PRIVATE "../" "${CMAKE_CURRENT_BINARY_DIR}/../../")
-target_link_libraries(hexen SDL2::SDL2 SDL2::mixer SDL2::net)
+target_link_libraries(hexen SDL2::SDL2)
+if(ENABLE_SDL2_mixer)
+    target_link_libraries(hexen SDL2::mixer)
+endif()
+if(ENABLE_SDL2_NET)
+    target_link_libraries(hexen SDL2::net)
+endif()
diff --git a/src/i_input.c b/src/i_input.c
@@ -16,6 +16,7 @@
 //     SDL implementation of system-specific input interface.
 //
 
+#include <string.h>
 
 #include "SDL.h"
 #include "SDL_keycode.h"