small changes

Author: cfrankb

.github/workflows/android.yml

@@ -29,6 +29,13 @@ jobs:
           submodules: recursive
           fetch-depth: 0 # fetch full history including tags
 
+      - name: Checkout Data Repo
+        uses: actions/checkout@v6
+        with:
+          repository: cfrankb/cs3-data-private
+          path: data
+          token: ${{ secrets.CS3_REPO_TOKEN }} # Only if internal access is enabled
+
       - name: Update build information
         run: |
           bin/setbuild.sh

.github/workflows/appImage-build.yml

@@ -29,6 +29,13 @@ jobs:
           submodules: recursive
           fetch-depth: 0 # fetch full history including tags
 
+      - name: Checkout Data Repo
+        uses: actions/checkout@v6
+        with:
+          repository: cfrankb/cs3-data-private
+          path: data
+          token: ${{ secrets.CS3_REPO_TOKEN }} # Only if internal access is enabled
+
       - name: Update build information
         run: |
           bin/setbuild.sh

.github/workflows/deb-package.yml

@@ -23,6 +23,13 @@ jobs:
           submodules: recursive
           fetch-depth: 0 # fetch full history including tags
 
+      - name: Checkout Data Repo
+        uses: actions/checkout@v6
+        with:
+          repository: cfrankb/cs3-data-private
+          path: data
+          token: ${{ secrets.CS3_REPO_TOKEN }} # Only if internal access is enabled
+
       - name: Update build information
         run: |
           bin/setbuild.sh

.github/workflows/macos.yml

@@ -25,6 +25,13 @@ jobs:
           submodules: recursive
           fetch-depth: 0 # fetch full history including tags
 
+      - name: Checkout Data Repo
+        uses: actions/checkout@v6
+        with:
+          repository: cfrankb/cs3-data-private
+          path: data
+          token: ${{ secrets.CS3_REPO_TOKEN }} # Only if internal access is enabled
+
       - name: Update build information
         run: |
           bin/setbuild.sh

.gitignore

@@ -14,6 +14,7 @@ local/*
 setup/*
 bb/*
 data/*
+data
 #VERSION
 #/CMakeLists.txt
 levels2.mapz

CMakeLists.txt

@@ -9,7 +9,7 @@ if(CMAKE_C_COMPILER MATCHES "x86_64-w64-mingw32.*")
 endif()
 
 
-if(EMSCRIPTEN)
+if(CMAKE_SYSTEM_NAME STREQUAL "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 ")
@@ -43,7 +43,8 @@ endif()
 add_subdirectory(src)
 
 # Add External
-if(EMSCRIPTEN)
+#if(EMSCRIPTEN)
+if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     set(SDLMIXER_MOD_XMP ON CACHE BOOL "Enable libxmp module support")
     set(SDLMIXER_VENDORED ON CACHE BOOL "Use vendored libxmp")
 elseif(IS_MINGW)
@@ -58,6 +59,11 @@ elseif(IS_MINGW)
     #cmake --build build/mingw --target help
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+   # Emscripten-specific setup
+else()
+    # Non-Emscripten setup
+endif()
 add_subdirectory(external/SDL3 SDL3)
 add_subdirectory(external/SDL3_mixer SDL3_mixer)
 
@@ -71,7 +77,8 @@ add_executable(${PROJECT_NAME} src/main.cpp)
 #add_subdirectory(tests)
 
 
-if(EMSCRIPTEN)
+#if(EMSCRIPTEN)
+if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     set(BPATH "${CMAKE_CURRENT_BINARY_DIR}")
     set(DATA_SRC "${CMAKE_SOURCE_DIR}/data")
     set(DATA_DST "${BPATH}/ems_data")
@@ -106,6 +113,7 @@ if(EMSCRIPTEN)
         -sASYNCIFY
         -sEXPORTED_RUNTIME_METHODS=ccall,cwrap
         -sEXPORTED_FUNCTIONS=_main,_malloc,_free
+        #-sUSE_WEBGPU=1
     )
     target_link_libraries(${PROJECT_NAME}
         PRIVATE SDL3::SDL3 SDL3_mixer::SDL3_mixer src_lib

bin/build.sh

@@ -30,18 +30,16 @@ elif [[ "$1" == "run_ems" ]] ; then
 elif [[ "$1" == "clean" ]] ; then
     rm -rf build
 elif [[ "$1" == "bosses" ]] ; then
-    DEST=/home/cfrankb/toolkit/gcc/cs3-runtime-sdl/data/pixels
+    #DEST=/home/cfrankb/toolkit/gcc/cs3-runtime-sdl/data/pixels
+    DEST=${PWD}/data/pixels
     cd techdocs/bosses
     python parse.py
     cd ../..
     cd tools/sheet
     make && build/sheet config/bosses.txt
     make && build/sheet config/beholder1.txt
-    #build/sheet config/beholder1.txt
-    #cp out/bosses.png ../../data/pixels/sheet0.obl
-    #cp out/beholder1.png ../../data/pixels/sheet1.obl
     cp out/bosses.png ${DEST}/sheet0.obl
-    cp out/beholder1.png ${DEST}//sheet1.obl
+    cp out/beholder1.png ${DEST}/sheet1.obl
 elif [[ "$1" == "tests" ]] ; then
     cmake -S . -B build
     cmake --build build --target cs3-tests

src/.gitignore

@@ -0,0 +1 @@
+**/CMakeLists.txt

src/shared/implementers/mu_sdl.h

@@ -58,7 +58,7 @@ class CMusicSDL : public IMusic
     MusicData m_data; // Background Music
     uint8_t m_type = TYPE_NONE;
     bool m_playing = false;
-#if defined(EMSCRIPTEN)
+#if defined(__EMSCRIPTEN__)
     std::string m_filepath;
 #endif
 };