compilation fix 3

Author: cfrankb

.github/workflows/android.yml

@@ -34,6 +34,10 @@ jobs:
           bin/setbuild.sh
           cat src/build.h
 
+      - name: Update CMakeLists.txt
+        run: |
+          python3 bin/refresh.py
+
       - name: Patch source
         run: |
           printf "\nbetaui        true\n" >> data/game.cfg

android-project/app/jni/CMakeLists.txt

@@ -6,45 +6,47 @@ add_subdirectory(../../../external/SDL3 SDL3)
 add_subdirectory(../../../external/SDL3_mixer SDL3_mixer)
 
 add_library(main SHARED
-        ../../../src/assetman.cpp
-        ../../../src/animator.cpp
-        ../../../src/recorder.cpp
-        ../../../src/strhelper.cpp
-        ../../../src/game.cpp
-        ../../../src/gameui.cpp
         ../../../src/actor.cpp
-        ../../../src/statedata.cpp
-        ../../../src/colormap.cpp
-        ../../../src/menuitem.cpp
-        ../../../src/states.cpp
-        ../../../src/menu.cpp
+        ../../../src/ai_path.cpp
+        ../../../src/animator.cpp
+        ../../../src/assetman.cpp
+        ../../../src/boss.cpp
+        ../../../src/bossdata.cpp
         ../../../src/chars.cpp
-        ../../../src/runtime.cpp
-        ../../../src/map.cpp
+        ../../../src/colormap.cpp
+        ../../../src/game.cpp
+        ../../../src/game_ai.cpp
         ../../../src/gamemixin.cpp
+        ../../../src/gamestats.cpp
+        ../../../src/gameui.cpp
         ../../../src/level.cpp
-        ../../../src/maparch.cpp
+        ../../../src/logger.cpp
         ../../../src/main.cpp
+        ../../../src/map.cpp
+        ../../../src/maparch.cpp
+        ../../../src/menu.cpp
+        ../../../src/menuitem.cpp
         ../../../src/parseargs.cpp
-        ../../../src/tilesdata.cpp
-        ../../../src/gamestats.cpp
-        ../../../src/shared/FileWrap.cpp
-        ../../../src/shared/FileMem.cpp
-        ../../../src/shared/helper.cpp
+        ../../../src/randomz.cpp
+        ../../../src/recorder.cpp
+        ../../../src/runtime.cpp
         ../../../src/shared/DotArray.cpp
+        ../../../src/shared/FileMem.cpp
+        ../../../src/shared/FileWrap.cpp
         ../../../src/shared/Frame.cpp
         ../../../src/shared/FrameSet.cpp
         ../../../src/shared/PngMagic.cpp
+        ../../../src/shared/helper.cpp
         ../../../src/shared/implementers/mu_sdl.cpp
         ../../../src/shared/implementers/sn_sdl.cpp
+        ../../../src/statedata.cpp
+        ../../../src/states.cpp
+        ../../../src/strhelper.cpp
+        ../../../src/tilesdata.cpp
 )
 target_link_libraries(main
     PRIVATE SDL3::SDL3 SDL3_mixer::SDL3_mixer
     z
     android
     log
 )
-
-# Your game and its CMakeLists.txt are in a subfolder named "src"
-#add_subdirectory(src)
-

bin/refresh.py

@@ -5,6 +5,9 @@
 
 TAB = " " * 4
 
+########################################################
+# vanilla application
+
 
 def generate_file(folder, sub_folders):
     if not os.path.isdir(folder):
@@ -89,6 +92,10 @@ def generate_file(folder, sub_folders):
         tfile.write("\n".join(lines) + "\n")
 
 
+################################################
+# tests
+
+
 def generate_tests(folder):
     if not os.path.isdir(folder):
         print(f"not a directory: {folder}")
@@ -133,7 +140,55 @@ def generate_tests(folder):
         tfile.write("\n".join(lines) + "\n")
 
 
+#########################################################
+# android port
+
+
+def generate_android_cmake():
+    file_path = "android-project/app/jni/CMakeLists.txt"
+
+    lines = [
+        """
+cmake_minimum_required(VERSION 3.6)
+
+project(GAME)
+
+add_subdirectory(../../../external/SDL3 SDL3)
+add_subdirectory(../../../external/SDL3_mixer SDL3_mixer)
+
+add_library(main SHARED
+             """.strip()
+    ]
+
+    sub_folders = ["src", "src/shared", "src/shared/implementers"]
+    files = []
+
+    for folder in sub_folders:
+        files += glob.glob(f"{folder}/*.cpp")
+
+    files.sort()
+    lines += [
+        f"{TAB*2}../../../{file}" for file in files if "tilesdebug.cpp" not in file
+    ]
+    lines += [
+        """
+)
+target_link_libraries(main
+    PRIVATE SDL3::SDL3 SDL3_mixer::SDL3_mixer
+    z
+    android
+    log
+)
+
+""".strip()
+    ]
+
+    with open(file_path, "w") as tfile:
+        tfile.write("\n".join(lines) + "\n")
+
+
 generate_file("src", ["src/shared", "src/shared/implementers"])
 generate_file("src/shared", [])
 generate_file("src/shared/implementers", [])
 generate_tests("tests")
+generate_android_cmake()

packages/bin/deb-genc.py

@@ -52,7 +52,7 @@
 MAN_PAGE = f"""
 .TH YOURGAME 6 "{now.strftime("%B %Y")}" "{APP_LONG_NAME} {VERSION}" "User Commands"
 .SH NAME
-{APP_NAME} \- {DESCRIPTION}
+{APP_NAME} - {DESCRIPTION}
 .SH SYNOPSIS
 .B {APP_NAME}
 .SH DESCRIPTION