Some fixes

Author: fjtrujy

cmake/preprocess_vu1.cmake

@@ -16,12 +16,15 @@ elseif(STEP STREQUAL "pp2")
     if(NOT DEFINED GASP_TOOL)
         message(FATAL_ERROR "GASP_TOOL not defined")
     endif()
+    # Use wrapper script for better error handling
     execute_process(
-        COMMAND ${GASP_TOOL} -c ";" -I${SOURCE_DIR}/vu1 -o ${OUTPUT} ${INPUT}
+        COMMAND ${SOURCE_DIR}/cmake/run_masp.sh ${GASP_TOOL} ${SOURCE_DIR}/vu1 ${OUTPUT} ${INPUT}
         RESULT_VARIABLE result
+        OUTPUT_VARIABLE output
+        ERROR_VARIABLE error
     )
     if(NOT result EQUAL 0)
-        message(FATAL_ERROR "Step 2 preprocessing (${GASP_TOOL}) failed")
+        message(FATAL_ERROR "Step 2 preprocessing (${GASP_TOOL}) failed\nOutput: ${output}\nError: ${error}\nInput: ${INPUT}\nOutput: ${OUTPUT}")
     endif()
 
 elseif(STEP STREQUAL "pp3")
@@ -36,8 +39,11 @@ elseif(STEP STREQUAL "pp3")
 
 elseif(STEP STREQUAL "pp4")
     # Step 4: C preprocessor with memory layout
+    # Use -w to suppress warnings about unmatched quotes in assembly comments
+    # Escape backslashes before preprocessing, then restore them after
+    # This preserves masp/gasp local labels like \xformed_vert while allowing normal C preprocessing
     execute_process(
-        COMMAND /bin/bash -c "cat ${INPUT} | ${COMPILER} -E -P -I${SOURCE_DIR}/vu1 -imacros ${MEM_HEADER} -o ${OUTPUT} -"
+        COMMAND /bin/bash -c "sed 's/\\\\/\\\\\\\\/g' ${INPUT} | ${COMPILER} -E -P -w -I${SOURCE_DIR}/vu1 -imacros ${MEM_HEADER} - | sed 's/\\\\\\\\/\\\\/g' > ${OUTPUT}"
         RESULT_VARIABLE result
     )
     if(NOT result EQUAL 0)