Update project to compile with overhauled toolchain

.gitignore

@@ -3,5 +3,4 @@ android
 build
 out
 CMakeSettings.json
-sis
 tmp

CMakeLists.txt

@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.00)
 
 # Use CMake or Visual Studio to enable these settings.
-option(INSTALL_EKA2L1        "Install app for EKA2L1"         OFF)
 option(GENERATE_SIS          "Generate Symbian SIS installer" OFF)
 option(BUILD_ON_ALT_PLATFORM "Build on alternate platform"    OFF)
 
@@ -17,9 +16,6 @@ endif()
 
 project(wordle C CXX)
 
-include(SDL)
-include(dbgprint)
-
 set(UID1    0x1000007a) # KExecutableImageUidValue, e32uid.h
 set(UID2    0x100039ce) # KAppUidValue16, apadef.h
 set(UID3    0x1000abcd) # game.exe UID
@@ -30,8 +26,7 @@ set(GCC_MODE_DEFS -DNDEBUG -D_UNICODE)
 set(GCC_DEFS      ${GCC_COMN_DEFS} ${GCC_MODE_DEFS})
 
 set(game_libs
-    ${CMAKE_CURRENT_BINARY_DIR}/libSDL.a
-    ${CMAKE_CURRENT_BINARY_DIR}/libdbgprint.a
+    ${EXTRA_LIB}/libSDL.a
     ${EPOC_PLATFORM}/gcc/lib/gcc-lib/arm-epoc-pe/2.9-psion-98r2/libgcc.a
     ${EPOC_LIB}/egcc.lib
     ${EPOC_LIB}/euser.lib
@@ -86,31 +81,21 @@ pack_assets(${RESOURCE_DIR} "${game_resources}")
 build_aif(${RESOURCE_DIR} wordle ${APP_UID})
 build_resource(${SRC_DIR} wordle "")
 
-if(INSTALL_EKA2L1)
-    copy_file(data.pfs   ${RESOURCE_DIR}             ${EKA2L1_E_DRIVE}/System/Apps/wordle data.pfs)
-    copy_file(game.exe   ${CMAKE_CURRENT_BINARY_DIR} ${EKA2L1_E_DRIVE}/System/Apps/wordle game.exe)
-    copy_file(wordle.app ${CMAKE_CURRENT_BINARY_DIR} ${EKA2L1_E_DRIVE}/System/Apps/wordle wordle.app)
-    copy_file(wordle.rsc ${CMAKE_CURRENT_BINARY_DIR} ${EKA2L1_E_DRIVE}/System/Apps/wordle wordle.rsc)
-    copy_file(wordle.aif ${CMAKE_CURRENT_BINARY_DIR} ${EKA2L1_E_DRIVE}/System/Apps/wordle wordle.aif)
-endif()
-
 if(GENERATE_SIS)
-    copy_file(data.pfs   ${RESOURCE_DIR}             ${CMAKE_CURRENT_SOURCE_DIR}/sis data.pfs)
-    copy_file(game.exe   ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/sis game.exe)
-    copy_file(wordle.app ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/sis wordle.app)
-    copy_file(wordle.rsc ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/sis wordle.rsc)
-    copy_file(wordle.aif ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/sis wordle.aif)
-    build_sis(${RESOURCE_DIR} wordle)
+  build_sis(${RESOURCE_DIR} wordle)
+
+  add_dependencies(
+    wordle.sis
+    game.exe
+    wordle.aif
+    wordle.app
+    wordle.rsc)
 endif()
 
 add_dependencies(
     game.exe
     game)
 
-add_dependencies(
-    game
-    SDL)
-
 target_compile_definitions(
     game
     PUBLIC

CMakeSettings.json

@@ -11,11 +11,6 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "variables": [
-        {
-          "name": "INSTALL_EKA2L1",
-          "value": "True",
-          "type": "BOOL"
-        },
         {
           "name": "GENERATE_SIS",
           "value": "True",
@@ -24,4 +19,4 @@
       ]
     }
   ]
-}
+}

res/wordle.pkg

@@ -10,8 +10,8 @@
 (0x101F6F88), 0, 0, 0, {"Series60ProductID"}
 
 ;
-"..\sis\data.pfs"-"E:\System\Apps\wordle\data.pfs"
-"..\sis\game.exe"-"E:\System\Apps\wordle\game.exe"
-"..\sis\wordle.aif"-"E:\System\Apps\wordle\wordle.aif"
-"..\sis\wordle.app"-"E:\System\Apps\wordle\wordle.app"
-"..\sis\wordle.rsc"-"E:\System\Apps\wordle\wordle.rsc"
+"..\res\data.pfs"-"E:\System\Apps\wordle\data.pfs"
+"..\out\build\Release\game.exe"-"E:\System\Apps\wordle\game.exe"
+"..\out\build\Release\wordle.aif"-"E:\System\Apps\wordle\wordle.aif"
+"..\out\build\Release\wordle.app"-"E:\System\Apps\wordle\wordle.app"
+"..\out\build\Release\wordle.rsc"-"E:\System\Apps\wordle\wordle.rsc"