Fix #38

Author: mupfdev

CMakeLists.txt

@@ -29,55 +29,28 @@ set(open8_sources
   ${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})
+  add_executable(open8 ${open8_sources})
 else()
-  add_executable(open8 WIN32 ${open8_sources} ${z8lua_sources})
+  add_executable(open8 WIN32 ${open8_sources})
 endif()
 
 if (NGAGESDK)
   target_link_libraries(open8 PRIVATE SDL3_mixer::SDL3_mixer)
   target_link_libraries(open8 PRIVATE SDL3::SDL3)
+  target_link_libraries(open8 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib/armi/urel/z8lua.lib)
 
   set_property(TARGET open8 PROPERTY C_STANDARD 99)
 
   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})
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/z8lua)
+  target_link_libraries(open8 PRIVATE ${SDL3_LIBRARIES} z8lua)
 endif()
 
+target_link_libraries(open8 PRIVATE z8lua)
 add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 
 include_directories(

lib/armi/urel/z8lua.lib

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
 
-option(BUILD_FOR_NOKIA_NGAGE "Build for Nokia N-Gage" OFF)
-
 set(z8lua_sources
   ${CMAKE_CURRENT_SOURCE_DIR}/lapi.c
   ${CMAKE_CURRENT_SOURCE_DIR}/lauxlib.c
@@ -32,27 +30,12 @@ set(z8lua_sources
   ${CMAKE_CURRENT_SOURCE_DIR}/lvm.c
   ${CMAKE_CURRENT_SOURCE_DIR}/lzio.c)
 
-if (BUILD_FOR_NOKIA_NGAGE)
-  if(DEFINED ENV{NGAGESDK})
-    set(NGAGESDK $ENV{NGAGESDK})
-    set(CMAKE_TOOLCHAIN_FILE ${NGAGESDK}/cmake/ngage-legacy-toolchain.cmake)
-  else()
-    message(FATAL_ERROR "The environment variable NGAGESDK needs to be defined.")
-  endif()
-
-  project(z8lua C)
+project(z8lua C)
 
-  set(GCC_MODULE_COMN_DEFS -D__SYMBIAN32__ -D__GCC32__ -D__EPOC32__ -D__MARM__ -D__MARM_ARMI__)
-  set(GCC_MODULE_MODE_DEFS -DNDEBUG -D_UNICODE)
-  set(GCC_MODULE_DEFS      ${GCC_MODULE_COMN_DEFS} ${GCC_MODULE_MODE_DEFS})
+if(NGAGESDK)
 
   add_library(z8lua STATIC ${z8lua_sources})
 
-  target_compile_definitions(
-    z8lua
-    PUBLIC
-    ${GCC_MODULE_DEFS})
-
 else()
 
   project(z8lua C)

src/z8lua/CMakeLists.txt

@@ -7,9 +7,16 @@
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "-DBUILD_FOR_NOKIA_NGAGE=ON",
+      "cmakeCommandArgs": "",
       "buildCommandArgs": "",
-      "ctestCommandArgs": ""
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "CMAKE_TOOLCHAIN_FILE",
+          "value": "${env.NGAGESDK}/cmake/ngage-legacy-toolchain.cmake",
+          "type": "FILEPATH"
+        }
+      ]
     },
     {
       "name": "x86-Release",