updated mingw workflow

Author: cfrankb

.github/workflows/mingw32.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - "master"
-      # - "develop"
+      - "develop"
     tags:
       - "v*"
   pull_request:
@@ -60,10 +60,11 @@ jobs:
 
       - name: Build your app
         run: |
-          python3 bin/gen.py mingw32-sdl3 -s
-          mkdir -p build
-          make build_libs
-          make
+          #python3 bin/gen.py mingw32-sdl3 -s
+          #mkdir -p build
+          #make build_libs
+          #make
+          bin/build.sh mingw
 
       - name: Make Installer
         run: |

CMakeLists.txt

@@ -4,26 +4,46 @@ project(${PROJECT_NAME} LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-if(MSVC)
-    add_compile_options(/W4 /permissive-)
-else()
-    add_compile_options(-Wall -Wextra -Wpedantic)
+if(CMAKE_C_COMPILER MATCHES "x86_64-w64-mingw32.*")
+    set(IS_MINGW TRUE)
 endif()
 
+
 if(EMSCRIPTEN)
     message(STATUS "Targeting Emscripten/WebAssembly ${CMAKE_SOURCE_DIR}")
     set(CMAKE_EXECUTABLE_SUFFIX ".html")  # Optional: .html shell
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -sUSE_SDL=0 -O3 -sUSE_ZLIB=1 ")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+elseif(IS_MINGW)
+    message(STATUS "Targeting MinGW/Windows")
+    set(SDL3_DIR "${CMAKE_SOURCE_DIR}/external/SDL3")
+    set(SDL3_DISABLE_INSTALL ON)
+    set(SDL3_mixer_DISABLE_INSTALL ON)
+elseif(MSVC)
+    message(STATUS "Using MSVC")
+    add_compile_options(/W4 /permissive-)
 else()
     message(STATUS "Targeting native GCC/Linux")
+    message(STATUS "Using GCC or Clang")
+    add_compile_options(-Wall -Wextra -Wpedantic)
 endif()
 
 add_subdirectory(src)
 
 # Add External
 if(EMSCRIPTEN)
-    set(libxmp_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/external/libxmp/include")
-    set(libxmp_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/build/ems/build_libxmp/libxmp.a")
+    set(SDLMIXER_MOD_XMP ON CACHE BOOL "Enable libxmp module support")
+    set(SDLMIXER_VENDORED ON CACHE BOOL "Use vendored libxmp")
+elseif(IS_MINGW)
+    set(SDL3_mixer_DISABLE_FIND_PACKAGE_SDL3 ON)
+    set(SDLMIXER_MOD_XMP ON CACHE BOOL "Enable libxmp module support")
+    set(SDLMIXER_VENDORED ON CACHE BOOL "Use vendored libxmp")
+    set(SDLMIXER_MOD_XMP_SHARED OFF CACHE BOOL "Build libxmp statically")
+    set(SDLMIXER_BUILD_SHARED_LIBS OFF CACHE BOOL "Build SDL3_mixer statically")
+    set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
+    set(ZLIB_BUILD_TESTING OFF CACHE BOOL "Disable zlib test targets like infcover")
+    add_subdirectory(external/zlib zlib)
+    #cmake --build build/mingw --target help
 endif()
 
 add_subdirectory(external/SDL3 SDL3)
@@ -33,11 +53,12 @@ add_subdirectory(external/SDL3_mixer SDL3_mixer)
 #add_executable(${PROJECT_NAME} ${SRC_EXPORTED_FILES})
 add_executable(${PROJECT_NAME} src/main.cpp)
 
-enable_testing()
-add_subdirectory(tests)
+#enable_testing()
+#add_subdirectory(tests)
 
 
 if(EMSCRIPTEN)
+    message(STATUS "Link Target EMSCRIPTEN")
     target_link_options(${PROJECT_NAME} PRIVATE
         #--preload-file ../data@data
         --preload-file ems_data@data
@@ -57,19 +78,25 @@ if(EMSCRIPTEN)
         -sEXPORTED_RUNTIME_METHODS=ccall,cwrap
         -sEXPORTED_FUNCTIONS=_main,_malloc,_free
     )
-endif()
-
-if(EMSCRIPTEN)
-    message(STATUS "Looking for libxmp.a in: ${CMAKE_CURRENT_SOURCE_DIR}/build/ems/build_libxmp")
-    add_library(libxmp_static STATIC IMPORTED GLOBAL)
-    set_target_properties(libxmp_static PROPERTIES
-        IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/build/ems/build_libxmp/libxmp.a"
-        INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/external/libxmp/include"
+    target_link_libraries(${PROJECT_NAME}
+        PRIVATE SDL3::SDL3 SDL3_mixer::SDL3_mixer src_lib
+    )
+elseif(IS_MINGW)
+    message(STATUS "Link Target MinGW/Windows")
+    target_link_options(${PROJECT_NAME} PRIVATE
+        -Wl,-t -mwindows
+        -static-libstdc++
+        -static-libgcc
+        -lwinpthread
+        -lmingw32
+        -s
     )
     target_link_libraries(${PROJECT_NAME}
-        PRIVATE SDL3::SDL3 SDL3_mixer::SDL3_mixer libxmp_static src_lib
-)
+        PRIVATE SDL3::SDL3 SDL3_mixer::SDL3_mixer  zlib src_lib
+    )
+
 else()
+    message(STATUS "Link Target Linux")
     #find_library(XMP_LIBRARY xmp)
     #find_library(OGG_LIBRARY ogg)
     #find_library(VORBIS_LIBRARY vorbisfile)
@@ -80,7 +107,9 @@ else()
 endif()
 
 target_include_directories(${PROJECT_NAME} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL3/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL3_mixer/include
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_SOURCE_DIR}/external/SDL3/include
+    ${CMAKE_SOURCE_DIR}/external/SDL3_mixer/include
+    ${CMAKE_SOURCE_DIR}/external/zlib
 )
+

bin/build.sh

@@ -5,6 +5,7 @@ show_help () {
     printf '\navailable targets:\n\n'
     echo "sdl3      "
     echo "emsdl3    "
+    echo "mingw     "
 }
 
 APP_NAME=cs3-runtime
@@ -22,14 +23,20 @@ elif [[ "$1" == "emsdl3" ]] ; then
     # preload only xm files/ download ogg files from web
     mkdir -p ${BPATH}/ems_data && cp -r data/* ${BPATH}/ems_data && mv ${BPATH}/ems_data/musics/*.ogg ${BPATH}
     ls ${BPATH}/ems_data -l
-    emcmake cmake -S external/libxmp -B ${BPATH}/build_libxmp -DBUILD_SHARED_LIBS=OFF
-    cmake --build ${BPATH}/build_libxmp
     emcmake cmake -B ${BPATH} -DCMAKE_BUILD_TYPE=Release
-    cmake --build ${BPATH} && echo "To run: emrun --hostname 0.0.0.0 ${TARGET}"
+    cmake --build ${BPATH}  -- VERBOSE=1   && echo "To run: emrun --hostname 0.0.0.0 ${TARGET}"
+elif [[ "$1" == "mingw" ]] ; then
+    BPATH=build/mingw
+    cmake -DCMAKE_TOOLCHAIN_FILE=packages/cmake/mingw.toolchain.cmake -DIS_MINGW=ON -B ${BPATH} -DCMAKE_BUILD_TYPE=Release
+    cmake --build ${BPATH} -- VERBOSE=1
 elif [[ "$1" == "run_ems" ]] ; then
     emrun --hostname 0.0.0.0 build/ems/cs3-runtime.html
 elif [[ "$1" == "clean" ]] ; then
     rm -rf build
+elif [[ "$1" == "tests" ]] ; then
+    # rm -rf build
+    cmake -S . -B build
+    cmake --build build --target cs3-tests
 elif [ -z "$1" ]; then
     echo "nothing to do"
     show_help

bin/refresh.py

@@ -65,10 +65,19 @@ def generate_file(folder, sub_folders):
     ${{CMAKE_CURRENT_SOURCE_DIR}}
     {prefix}external/SDL3/include
     {prefix}external/SDL3_mixer/include
+    {prefix}external/zlib
     )
 """.strip()
     )
 
+    lines.append("")
+    lines.append("if(IS_MINGW)")
+    lines.append(
+        f"target_link_libraries({master_lib} PRIVATE SDL3_mixer::SDL3_mixer zlib)"
+    )
+    lines.append("endif()")
+    lines.append("")
+
     with open(file_path, "w") as tfile:
         tfile.write("\n".join(lines) + "\n")
 
@@ -107,6 +116,9 @@ def generate_tests(folder):
     lines.append("")
     lines.append("add_test(NAME cs3-runtime-tests COMMAND cs3-tests)")
 
+    lines.append("")
+    lines.append('message(STATUS "Building cs3-tests with ${TEST_SOURCES}")')
+
     with open(file_path, "w") as tfile:
         tfile.write("\n".join(lines) + "\n")
 

data/levels.mapz

@@ -1,15 +1,22 @@
 #!/bin/bash
+BPATH=build/mingw
+DEST=setup
 
 rm -rf setup/*
 mkdir -p setup/data
 mkdir -p setup/legal
 cp -R data/* setup/data
-cp build/*.exe setup
+cp ${BPATH}/*.exe setup
 cp -R techdocs/legal/* setup/legal
 cp techdocs/*.md setup/legal
 cp LICENSE setup
 PTHREAD_DLL=$(find /usr/x86_64-w64-mingw32/ | grep libwinpthread-1.dll | head -n 1)
 echo PTHREAD_DLL=$PTHREAD_DLL
 cp $PTHREAD_DLL setup
-cp local/mingw/bin/*.dll setup
-ls -l setup
+#cp local/mingw/bin/*.dll setup
+cp ${BPATH}/SDL3/*.dll ${DEST}
+cp ${BPATH}/SDL3_mixer/*.dll ${DEST}
+cp ${BPATH}/SDL3/*.dll ${DEST}
+cp ${BPATH}/zlib/*.dll ${DEST}
+#cp ${BPATH}/build_libxmp/*.dll ${DEST}
+ls -l ${DEST}

packages/bin/makesetup.sh

@@ -0,0 +1,18 @@
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
+set(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
+
+set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
+set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

packages/cmake/mingw.toolchain.cmake

@@ -23,6 +23,7 @@
 #include <set>
 #include <algorithm>
 #include <memory>
+#include <array>
 #include "game.h"
 #include "map.h"
 #include "actor.h"

src/game.cpp

@@ -24,7 +24,7 @@
 #include <SDL3/SDL.h>
 #endif
 
-Logger::Level Logger::m_minLevel = Logger::INFO;
+Logger::Level Logger::m_minLevel = Logger::L_INFO;
 FILE *Logger::m_output = nullptr;
 std::mutex Logger::m_mutex;
 
@@ -53,18 +53,18 @@ void Logger::log(Level level, const char *tag, const char *format, ...)
                                                                     : ANDROID_LOG_FATAL;
     __android_log_vprint(priority, tag, format, args);
 #else
-    FILE *out = m_output ? m_output : (level == ERROR || level == FATAL) ? stderr
-                                                                         : stdout;
-    fprintf(out, "[%s/%s] ", tag, level == INFO ? "INFO" : level == WARN ? "WARN"
-                                                       : level == ERROR  ? "ERROR"
-                                                                         : "FATAL");
+    FILE *out = m_output ? m_output : (level == L_ERROR || level == L_FATAL) ? stderr
+                                                                             : stdout;
+    fprintf(out, "[%s/%s] ", tag, level == L_INFO ? "INFO" : level == L_WARN ? "WARN"
+                                                         : level == L_ERROR  ? "ERROR"
+                                                                             : "FATAL");
     vfprintf(out, format, args);
 
     std::string s = std::string(format);
     auto p = s.rfind('\n');
     if (p == std::string::npos || p != s.size() - 1)
         fprintf(out, "\n");
-    if (level == FATAL)
+    if (level == L_FATAL)
         exit(1);
 #endif
     va_end(args);

src/logger.cpp

@@ -29,10 +29,10 @@ class Logger
 public:
     enum Level
     {
-        INFO,
-        WARN,
-        ERROR,
-        FATAL
+        L_INFO,
+        L_WARN,
+        L_ERROR,
+        L_FATAL
     };
     static void setLevel(Level minLevel) { m_minLevel = minLevel; }
     static void setOutputFile(const std::string &filename);
@@ -53,16 +53,16 @@ class Logger
 #define LOGE(...) qCritical(__VA_ARGS__)
 #define LOGF(...) qFatal(__VA_ARGS__)
 #else
-#define LOGI(...)                        \
-    if (Logger::level() <= Logger::INFO) \
-    Logger::log(Logger::INFO, __FILE_NAME__, __VA_ARGS__)
-#define LOGW(...)                        \
-    if (Logger::level() <= Logger::WARN) \
-    Logger::log(Logger::WARN, __FILE_NAME__, __VA_ARGS__)
-#define LOGE(...)                         \
-    if (Logger::level() <= Logger::ERROR) \
-    Logger::log(Logger::ERROR, __FILE_NAME__, __VA_ARGS__)
-#define LOGF(...)                                           \
-    Logger::log(Logger::FATAL, __FILE_NAME__, __VA_ARGS__); \
+#define LOGI(...)                          \
+    if (Logger::level() <= Logger::L_INFO) \
+    Logger::log(Logger::L_INFO, __FILE_NAME__, __VA_ARGS__)
+#define LOGW(...)                          \
+    if (Logger::level() <= Logger::L_WARN) \
+    Logger::log(Logger::L_WARN, __FILE_NAME__, __VA_ARGS__)
+#define LOGE(...)                           \
+    if (Logger::level() <= Logger::L_ERROR) \
+    Logger::log(Logger::L_ERROR, __FILE_NAME__, __VA_ARGS__)
+#define LOGF(...)                                             \
+    Logger::log(Logger::L_FATAL, __FILE_NAME__, __VA_ARGS__); \
     exit(1)
 #endif