Attempt to fix Nokia N-Gage CI.

mupfdev · mupfdev · commit 06b0cf97eb3d · 2025-05-11T19:59:31.000+02:00
diff --git a/.github/workflows/nokia-ngage.yml b/.github/workflows/nokia-ngage.yml
@@ -43,7 +43,7 @@ jobs:
       shell: pwsh
 
     - name: Fetch SDK
-      run: cmake -G "Ninja" -S ${{ env.NGAGESDK }}/setup -B ${{ env.NGAGESDK }}/projects/open8/out/build/N-Gage
+      run: cmake -G "Ninja" -P ${{ env.NGAGESDK }}/setup/setup.cmake -B ${{ env.NGAGESDK }}/projects/open8/out/build/N-Gage
       shell: pwsh
 
     - name: Remove existing open8 directory
@@ -56,12 +56,12 @@ jobs:
 
     - name: Build open8
       run: |
-        cmake -DBUILD_FOR_NOKIA_NGAGE=ON -G "Ninja" -S ${{ env.NGAGESDK }}/projects/open8 -B ${{ env.NGAGESDK }}/projects/open8/out/build/N-Gage -DCMAKE_TOOLCHAIN_FILE=${{ env.NGAGESDK }}/cmake/ngage-toolchain.cmake
+        cmake -DCMAKE_PREFIX_PATH=${env.NGAGESDK}/sdk/extras/lib/cmake -G "Ninja" -S ${{ env.NGAGESDK }}/projects/open8 -B ${{ env.NGAGESDK }}/projects/open8/out/build/N-Gage -DCMAKE_TOOLCHAIN_FILE=${{ env.NGAGESDK }}/cmake/ngage-toolchain.cmake
         cmake --build ${{ env.NGAGESDK }}/projects/open8/out/build/N-Gage
       shell: pwsh
 
-    - name: Archive open8.sis
-      uses: actions/upload-artifact@v4
-      with:
-        name: open8.sis
-        path: ${{ env.NGAGESDK }}/projects/open8/out/build/N-Gage/open8.sis
+    #- name: Archive open8.sis
+    #  uses: actions/upload-artifact@v4
+    #  with:
+    #    name: open8.sis
+    #    path: ${{ env.NGAGESDK }}/projects/open8/out/build/N-Gage/open8.sis
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,177 +4,97 @@
 
 cmake_minimum_required(VERSION 3.10)
 
-option(BUILD_FOR_NOKIA_NGAGE "Build for Nokia N-Gage" OFF)
-option (BUILD_CI_WORKFLOW "Build CI workflow" OFF)
-
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/project_config.cmake)
-
-if (BUILD_FOR_NOKIA_NGAGE)
-
-  project(game C CXX)
-
-  add_compile_definitions(__NGAGE__)
-
-  set(UID1 0x1000007a) # KExecutableImageUidValue, e32uid.h
-  set(UID2 0x100039ce) # KAppUidValue16, apadef.h
-
-  set(game_static_libs
-    ${EPOC_EXTRAS}/lib/armi/urel/SDL3.lib
-    ${EPOC_EXTRAS}/lib/armi/urel/SDL3_mixer.lib)
-
-  set(game_libs
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/armi/urel/z8lua.lib
-    ${EPOC_LIB}/NRenderer.lib
-    ${EPOC_LIB}/3dtypes.a
-    ${EPOC_LIB}/cone.lib
-    ${EPOC_PLATFORM}/gcc/lib/gcc-lib/arm-epoc-pe/2.9-psion-98r2/libgcc.a
-    ${EPOC_PLATFORM}/ngagesdk/lib/gcc/arm-epoc-pe/4.6.4/libgcc_ngage.a
-    ${EPOC_LIB}/mediaclientaudiostream.lib
-    ${EPOC_LIB}/charconv.lib
-    ${EPOC_LIB}/bitgdi.lib
-    ${EPOC_LIB}/euser.lib
-    ${EPOC_LIB}/estlib.lib
-    ${EPOC_LIB}/ws32.lib
-    ${EPOC_LIB}/hal.lib
-    ${EPOC_LIB}/fbscli.lib
-    ${EPOC_LIB}/efsrv.lib
-    ${EPOC_LIB}/scdv.lib
-    ${EPOC_LIB}/gdi.lib)
-
-  set(open8_libs
-    ${EPOC_LIB}/euser.lib
-    ${EPOC_LIB}/apparc.lib
-    ${EPOC_LIB}/cone.lib
-    ${EPOC_LIB}/eikcore.lib
-    ${EPOC_LIB}/avkon.lib)
-
-  set(open8_sources
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/ngage/ngage.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/ngage/ngage_application.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/ngage/ngage_appui.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/ngage/ngage_appview.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/ngage/ngage_document.cpp")
-
-  add_library(game STATIC ${project_sources})
-  add_library(open8 STATIC ${open8_sources})
-  build_exe_static(game exe ${UID1} ${UID2} ${UID3} "${game_static_libs}" "${game_libs}")
-  build_dll(open8 app ${UID1} ${UID2} ${APP_UID} "${open8_libs}")
-
-  if(NOT BUILD_CI_WORKFLOW)
-    build_aif(${CMAKE_CURRENT_SOURCE_DIR}/res open8 ${APP_UID})
-    build_resource(${CMAKE_CURRENT_SOURCE_DIR}/res open8 "")
-    build_sis(${CMAKE_CURRENT_SOURCE_DIR}/res open8)
-
-    add_dependencies(
-      open8.sis
-      game.exe
-      open8.app
-      open8.aif
-      open8.rsc)
-  endif()
-
-  add_dependencies(
-    game.exe
-    game)
-
-  target_compile_definitions(
-    game
-    PUBLIC
-    __EXE__
-    UID1=${UID1}
-    UID2=${UID2}
-    UID3=${UID3})
-
-  target_include_directories(
-    game
-    PUBLIC
-    ${SRC_DIR})
 
-  add_dependencies(
-    open8.app
-    open8)
-
-  target_compile_definitions(
-    open8
-    PUBLIC
-    __DLL__
-    UID1=${UID1}
-    UID2=${UID2}
-    UID3=${APP_UID})
-
-  target_include_directories(
-    open8
-    PUBLIC
-    ${SRC_DIR})
+project(open8 C)
 
+if (NGAGESDK)
+  find_package(SDL3 REQUIRED)
+  find_package(SDL3_mixer REQUIRED)
 else()
-
-  project(open8 C)
-
   set(EXPORT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/export)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXPORT_DIR})
-
   include(get_SDL3)
   get_SDL3("3.2.12")
+endif()
 
-  set(z8lua_sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lapi.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lauxlib.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lbaselib.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lcode.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lcorolib.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lctype.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ldblib.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ldebug.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ldo.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ldump.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lfunc.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lgc.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/linit.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/llex.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lmem.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lobject.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lopcodes.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lparser.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lpico8lib.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lstate.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lstring.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lstrlib.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ltable.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ltablib.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ltm.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lundump.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lvm.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lzio.c)
-
-  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    add_executable(open8 ${project_sources} ${z8lua_sources})
-  else()
-    add_executable(open8 WIN32 ${project_sources} ${z8lua_sources})
-  endif()
-
-  target_link_libraries(open8 PRIVATE ${SDL3_LIBRARIES})
+set(open8_sources
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/main.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/api.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/app.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/auxiliary.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/memory.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/p8scii.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lexaloffle/p8_compress.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lexaloffle/pxa_compress_snippets.c)
+
+set(z8lua_sources
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lapi.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lauxlib.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lbaselib.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lcode.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lcorolib.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lctype.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ldblib.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ldebug.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ldo.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ldump.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lfunc.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lgc.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/linit.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/llex.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lmem.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lobject.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lopcodes.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lparser.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lpico8lib.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lstate.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lstring.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lstrlib.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ltable.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ltablib.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/ltm.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lundump.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lvm.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua/lzio.c)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  add_executable(open8 ${open8_sources} ${z8lua_sources})
+else()
+  add_executable(open8 WIN32 ${open8_sources} ${z8lua_sources})
+endif()
 
-  add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
+if (NGAGESDK)
+  target_link_libraries(open8 PRIVATE SDL3_mixer::SDL3_mixer)
+  target_link_libraries(open8 PRIVATE SDL3::SDL3)
 
-  include_directories(
-    "${CMAKE_CURRENT_SOURCE_DIR}/src"
-    "${sdl3_SOURCE_DIR}/include")
+  set_property(TARGET open8 PROPERTY C_STANDARD 99)
 
-  if (NINTENDO_3DS)
-    set(ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/romfs")
-    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/export/carts DESTINATION ${ROMFS_DIR})
-    set(SMDH_FILE "${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME}.smdh")
-    ctr_generate_smdh("${SMDH_FILE}"
-      NAME "open8"
-      DESCRIPTION "A portable PICO-8 emulator"
-      AUTHOR "Michael Fitzmayer"
-      ICON "${CMAKE_CURRENT_SOURCE_DIR}/icon.png")
-    ctr_create_3dsx(
-      ${APP_NAME}
-      ROMFS "${ROMFS_DIR}"
-      SMDH "${SMDH_FILE}")
-  endif()
+  target_link_options(open8 PRIVATE "SHELL:-s UID1=0x1000007a") # KExecutableImageUidValue, e32uid.h
+  target_link_options(open8 PRIVATE "SHELL:-s UID2=0x100039ce") # KAppUidValue16, apadef.h
+  target_link_options(open8 PRIVATE "SHELL:-s UID3=0x1000c37e") # open8.exe UID
+else()
+  target_link_libraries(open8 PRIVATE ${SDL3_LIBRARIES})
+endif()
 
+add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
+
+include_directories(
+  "${CMAKE_CURRENT_SOURCE_DIR}/src"
+  "${sdl3_SOURCE_DIR}/include")
+
+if (NINTENDO_3DS)
+  set(ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/romfs")
+  file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/export/carts DESTINATION ${ROMFS_DIR})
+  set(SMDH_FILE "${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME}.smdh")
+  ctr_generate_smdh("${SMDH_FILE}"
+    NAME "open8"
+    DESCRIPTION "A portable PICO-8 emulator"
+    AUTHOR "Michael Fitzmayer"
+    ICON "${CMAKE_CURRENT_SOURCE_DIR}/icon.png")
+  ctr_create_3dsx(
+    ${APP_NAME}
+    ROMFS "${ROMFS_DIR}"
+    SMDH "${SMDH_FILE}")
 endif()
diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -7,7 +7,7 @@
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "-DBUILD_FOR_NOKIA_NGAGE=ON",
+      "cmakeCommandArgs": "-DCMAKE_PREFIX_PATH=${env.NGAGESDK}/sdk/extras/lib/cmake",
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "variables": [
diff --git a/cmake/project_config.cmake b/cmake/project_config.cmake
diff --git a/src/api.c b/src/api.c
@@ -1414,6 +1414,6 @@ void update_time(void)
 
     Uint64 current_time = SDL_GetTicks();
     Uint64 elapsed_time_ticks = current_time - start_time;
-    fix32_t elapsed_time = fix32_from_int(elapsed_time_ticks) / 1000;
+    fix32_t elapsed_time = fix32_from_int((Sint32)elapsed_time_ticks) / 1000;
     seconds_since_start = elapsed_time;
 }

Original file line number	Diff line number	Diff line change
`@@ -1414,6 +1414,6 @@ void update_time(void)`
`1414`	`1414`
`1415`	`1415`	`Uint64 current_time = SDL_GetTicks();`
`1416`	`1416`	`Uint64 elapsed_time_ticks = current_time - start_time;`
`1417`		`- fix32_t elapsed_time = fix32_from_int(elapsed_time_ticks) / 1000;`
	`1417`	`+ fix32_t elapsed_time = fix32_from_int((Sint32)elapsed_time_ticks) / 1000;`
`1418`	`1418`	`seconds_since_start = elapsed_time;`
`1419`	`1419`	`}`