Pull in latest dtk-template changes; support progress categories (#338)

* Update project/config from latest dtk-template * Tidy some flag config stuff and fix a type checking error * Turn flags.json into a more general config.json; move asflags there * Set up progress-tracking categories * Some config/objects.json schema improvements * Adjust progress category names
DarkRTA · Sep 8, 2024 · 8ebdbdc · 8ebdbdc
1 parent 70e8142
commit 8ebdbdc
Show file tree

Hide file tree

Showing 9 changed files with 463 additions and 293 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -102,9 +102,9 @@
   "json.schemas": [
     {
       "fileMatch": [
-        "config/**/flags.json"
+        "config/**/config.json"
       ],
-      "url": "./doc/flags_schema.json"
+      "url": "./doc/config_schema.json"
     },
     {
       "fileMatch": [

diff --git a/config/SZBE69/flags.json → config/SZBE69/config.json b/config/SZBE69/flags.json → config/SZBE69/config.json
@@ -1,4 +1,15 @@
 {
+    "progress_categories": {
+        "game": "Game Code",
+        "network": "Networking Code",
+        "engine": "Milo Engine Code",
+        "lib": "Third-Party Libraries",
+        "sdk": "SDK Code"
+    },
+    "asflags": [
+        "-mgekko",
+        "--strip-local-absolute"
+    ],
     "ldflags": [
         "-fp hardware",
         "-nodefaults",
@@ -7,7 +18,6 @@
     ],
     "cflags": {
         "base": {
-            "base": null,
             "flags": [
                 "-nodefaults",
                 "-nosyspath",
@@ -42,7 +52,7 @@
 
                 "-O4,p",
                 "-inline noauto",
-                "-func_align 4" 
+                "-func_align 4"
             ]
         },
         "runtime": {

diff --git a/config/SZBE69/objects.json b/config/SZBE69/objects.json
@@ -1,5 +1,6 @@
 {
     "main": {
+        "progress_category": "game",
         "mw_version": "Wii/1.3",
         "cflags": "main",
         "objects": {
@@ -8,13 +9,15 @@
         }
     },
     "band3": {
+        "progress_category": "game",
         "mw_version": "Wii/1.3",
         "cflags": "band3",
         "objects": {
             "band3/bandtrack/TrackConfig.cpp": "Equivalent"
         }
     },
     "network": {
+        "progress_category": "network",
         "mw_version": "Wii/1.3",
         "cflags": "network",
         "objects": {
@@ -26,6 +29,7 @@
         }
     },
     "network/net/json_c": {
+        "progress_category": "lib",
         "mw_version": "Wii/1.3",
         "cflags": "json_c",
         "objects": {
@@ -37,6 +41,7 @@
         }
     },
     "zlib": {
+        "progress_category": "lib",
         "mw_version": "Wii/1.3",
         "cflags": "zlib",
         "objects": {
@@ -51,6 +56,7 @@
         }
     },
     "system": {
+        "progress_category": "engine",
         "mw_version": "Wii/1.3",
         "cflags": "system",
         "objects": {
@@ -238,7 +244,7 @@
             "system/ui/UITransitionHandler.cpp": "NonMatching",
             "system/ui/UITrigger.cpp": "NonMatching",
             "system/ui/UIGuide.cpp": "NonMatching",
-            
+
             "system/utl/BinStream.cpp": {"status": "LinkIssues", "comment": "operator<<(int) issues"},
             "system/utl/ChunkIDs.cpp": "Matching",
             "system/utl/MemStream.cpp": "NonMatching",
@@ -270,6 +276,7 @@
         }
     },
     "RVL_SDK": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "rvl_sdk",
         "objects": {
@@ -278,6 +285,7 @@
         }
     },
     "DWC": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "sdk/DWC",
         "objects": {

diff --git a/config/SZBE69_B8/flags.json → config/SZBE69_B8/config.json b/config/SZBE69_B8/flags.json → config/SZBE69_B8/config.json
@@ -1,12 +1,22 @@
 {
+    "progress_categories": {
+        "game": "Game Code",
+        "network": "Networking Code",
+        "engine": "Milo Engine Code",
+        "lib": "Third-Party Libraries",
+        "sdk": "SDK Code"
+    },
+    "asflags": [
+        "-mgekko",
+        "--strip-local-absolute"
+    ],
     "ldflags": [
         "-fp hardware",
         "-nodefaults",
         "-listclosure"
     ],
     "cflags": {
         "base": {
-            "base": null,
             "flags": [
                 "-nodefaults",
                 "-nosyspath",

diff --git a/config/SZBE69_B8/objects.json b/config/SZBE69_B8/objects.json
@@ -1,5 +1,6 @@
 {
     "main": {
+        "progress_category": "game",
         "mw_version": "Wii/1.3",
         "cflags": "main",
         "objects": {
@@ -11,6 +12,7 @@
         }
     },
     "band3": {
+        "progress_category": "game",
         "mw_version": "Wii/1.3",
         "cflags": "band3",
         "objects": {
@@ -69,6 +71,7 @@
         }
     },
     "network": {
+        "progress_category": "network",
         "mw_version": "Wii/1.3",
         "cflags": "network",
         "objects": {
@@ -95,6 +98,7 @@
         }
     },
     "network/json_c": {
+        "progress_category": "lib",
         "mw_version": "Wii/1.3",
         "cflags": "network/json_c",
         "objects": {
@@ -107,6 +111,7 @@
         }
     },
     "network/Platform": {
+        "progress_category": "network",
         "mw_version": "Wii/1.3",
         "cflags": "network/Platform",
         "objects": {
@@ -133,6 +138,7 @@
         }
     },
     "system": {
+        "progress_category": "engine",
         "mw_version": "Wii/1.3",
         "cflags": "system",
         "objects": {
@@ -656,13 +662,15 @@
         }
     },
     "system/flex": {
+        "progress_category": "engine",
         "mw_version": "Wii/1.3",
         "cflags": "system/flex",
         "objects": {
             "system/obj/DataFlex.c": "NonMatching"
         }
     },
     "system/speex": {
+        "progress_category": "lib",
         "mw_version": "Wii/1.3",
         "cflags": "system/speex",
         "objects": {
@@ -692,6 +700,7 @@
         }
     },
     "system/soundtouch": {
+        "progress_category": "lib",
         "mw_version": "Wii/1.3",
         "cflags": "system/soundtouch",
         "objects": {
@@ -704,6 +713,7 @@
         }
     },
     "system/tomcrypt": {
+        "progress_category": "lib",
         "mw_version": "Wii/1.3",
         "cflags": "system/tomcrypt",
         "objects": {
@@ -713,6 +723,7 @@
         }
     },
     "system/vorbis": {
+        "progress_category": "lib",
         "mw_version": "Wii/1.3",
         "cflags": "system/vorbis",
         "objects": {
@@ -739,6 +750,7 @@
         }
     },
     "system/zlib": {
+        "progress_category": "lib",
         "mw_version": "Wii/1.3",
         "cflags": "system/zlib",
         "objects": {
@@ -753,13 +765,15 @@
         }
     },
     "lib/binkwii": {
+        "progress_category": "lib",
         "mw_version": "Wii/1.3",
         "cflags": "base",
         "objects": {
 
         }
     },
     "sdk/MSL_C": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "sdk/MSL_C",
         "objects": {
@@ -776,6 +790,7 @@
         }
     },
     "sdk/MSL_C/fdlibm": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "sdk/MSL_C/fdlibm",
         "objects": {
@@ -814,6 +829,7 @@
         }
     },
     "sdk/MSL_C++": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "sdk/MSL_C++",
         "objects": {
@@ -826,6 +842,7 @@
         }
     },
     "sdk/Runtime": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "sdk/Runtime",
         "objects": {
@@ -843,13 +860,15 @@
         }
     },
     "sdk/MetroTRK": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "sdk/MSL",
         "objects": {
             "sdk/PowerPC_EABI_Support/MetroTRK/custconn/MWCriticalSection_gc.c": "Matching"
         }
     },
     "sdk/RVL_SDK": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "sdk/RVL_SDK",
         "objects": {
@@ -868,7 +887,7 @@
             "sdk/RVL_SDK/revolution/os/OSSemaphore.c": "Matching",
 
             "sdk/RVL_SDK/revolution/sc/scsystem.c": "NonMatching",
-    
+
             "sdk/RVL_SDK/revolution/wpad/WPADHIDParser.c": "NonMatching",
             "sdk/RVL_SDK/revolution/wpad/WPADEncrypt.c": "Matching",
             "sdk/RVL_SDK/revolution/wpad/WPADMem.c": "Matching",
@@ -879,6 +898,7 @@
         }
     },
     "sdk/RevoEX": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "sdk/RevoEX",
         "objects": {
@@ -889,6 +909,7 @@
         }
     },
     "sdk/ec": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "sdk/ec",
         "objects": {
@@ -935,6 +956,7 @@
         }
     },
     "sdk/ec_c": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "sdk/ec_c",
         "objects": {
@@ -945,13 +967,15 @@
         }
     },
     "sdk/NdevExi2A": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "base",
         "objects": {
 
         }
     },
     "sdk/DWC": {
+        "progress_category": "sdk",
         "mw_version": "Wii/1.3",
         "cflags": "sdk/DWC",
         "objects": {