fixed yue merge build

Author: nesbox

CMakeLists.txt

@@ -8,7 +8,7 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     if(MSVC)
         set(LINKER_FLAGS_RELEASE "/LTCG /OPT:REF /OPT:ICF")
     else()
-        set(FLAGS_RELEASE "-fno-function-sections -fno-data-sections -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-exceptions")
+        set(FLAGS_RELEASE "-fno-function-sections -fno-data-sections -fno-unwind-tables -fno-asynchronous-unwind-tables")
 
         if(APPLE)
             set(LINKER_FLAGS_RELEASE "-Wl,-dead_strip")

assets.sh

@@ -21,7 +21,7 @@ build/bin/prj2cart demos/sfx.lua build/assets/sfx.tic
 build/bin/prj2cart demos/squirreldemo.nut build/assets/squirreldemo.tic
 build/bin/prj2cart demos/tetris.lua build/assets/tetris.tic
 build/bin/prj2cart demos/wrendemo.wren build/assets/wrendemo.tic
-build/bin/prj2cart demos/yuedemo.yue build/yuedemo.tic
+build/bin/prj2cart demos/yuedemo.yue build/assets/yuedemo.tic
 
 build/bin/wasmp2cart demos/wasm/wasmdemo.wasmp build/assets/wasmdemo.tic --binary demos/wasm/wasmdemo.wasm
 build/bin/wasmp2cart demos/bunny/wasmmark/wasmmark.wasmp build/assets/wasmmark.tic --binary demos/bunny/wasmmark/wasmmark.wasm
@@ -35,4 +35,4 @@ build/bin/prj2cart demos/bunny/rubymark.rb build/assets/rubymark.tic
 build/bin/prj2cart demos/bunny/schememark.scm build/assets/schememark.tic
 build/bin/prj2cart demos/bunny/squirrelmark.nut build/assets/squirrelmark.tic
 build/bin/prj2cart demos/bunny/wrenmark.wren build/assets/wrenmark.tic
-build/bin/prj2cart demos/bunny/yuemark.yue build/yuemark.tic
+build/bin/prj2cart demos/bunny/yuemark.yue build/assets/yuemark.tic

build/assets/fenneldemo.tic

@@ -177,13 +177,13 @@ static const tic_outline_item* getYueOutline(const char* code, s32* size)
 }
 
 static const u8 DemoRom[] =
-    {
-#include "../build/assets/yuedemo.tic.dat"
+{
+    #include "yuedemo.tic.dat"
 };
 
 static const u8 MarkRom[] =
-    {
-#include "../build/assets/yuemark.tic.dat"
+{
+    #include "yuemark.tic.dat"
 };
 
 extern "C" TIC_EXPORT const tic_script EXPORT_SCRIPT(Yue) = {
@@ -221,12 +221,15 @@ extern "C" TIC_EXPORT const tic_script EXPORT_SCRIPT(Yue) = {
     0,                     // api_keywordsCount
     nullptr,               // api_keywords
     {                      // demo
-     DemoRom,
-     sizeof DemoRom,
-     nullptr},
-    {// mark
-     MarkRom,
-     sizeof MarkRom,
-     "yuemark.tic"},
+        DemoRom,
+        sizeof DemoRom,
+        nullptr
+    },
+    // mark
+    {
+        MarkRom,
+        sizeof MarkRom,
+        "yuemark.tic"
+    },
     nullptr // demos
 };