From 00b3750217c8943806d22fc7b6854d4ae8b2b979 Mon Sep 17 00:00:00 2001
From: Francisco Javier Trujillo Mata <fjtrujy@gmail.com>
Date: Tue, 19 May 2026 14:39:01 +0200
Subject: [PATCH] Fix CI

---
 .github/workflows/compilation.yml             |  16 ++---------
 .gitignore                                    |   1 +
 CMakeLists.txt                                |  12 +++++++++
 examples/CMakeLists.txt                       |  23 ++++++++++++++++
 examples/Makefile                             |  15 +++++++++++
 fast_nolights.vo                              | Bin 2256 -> 0 bytes
 test/CMakeLists.txt                           |  12 +++++++++
 fast.vcl => test/fixtures/fast.vcl            |   0
 .../fixtures/fast_nolights.vcl                |   0
 general.vcl => test/fixtures/general.vcl      |   0
 .../fixtures/general_nospec.vcl               |   0
 .../fixtures/general_nospec_quad.vcl          |   0
 .../fixtures/general_nospec_tri.vcl           |   0
 .../fixtures/general_pv_diff.vcl              |   0
 .../fixtures/general_pv_diff_quad.vcl         |   0
 .../fixtures/general_pv_diff_tri.vcl          |   0
 .../fixtures/general_quad.vcl                 |   0
 .../fixtures/general_tri.vcl                  |   0
 indexed.vcl => test/fixtures/indexed.vcl      |   0
 test/integration/test_cli.cpp                 |   2 +-
 tundra.lua                                    |  25 ------------------
 21 files changed, 66 insertions(+), 40 deletions(-)
 create mode 100644 examples/CMakeLists.txt
 create mode 100644 examples/Makefile
 delete mode 100644 fast_nolights.vo
 rename fast.vcl => test/fixtures/fast.vcl (100%)
 rename fast_nolights.vcl => test/fixtures/fast_nolights.vcl (100%)
 rename general.vcl => test/fixtures/general.vcl (100%)
 rename general_nospec.vcl => test/fixtures/general_nospec.vcl (100%)
 rename general_nospec_quad.vcl => test/fixtures/general_nospec_quad.vcl (100%)
 rename general_nospec_tri.vcl => test/fixtures/general_nospec_tri.vcl (100%)
 rename general_pv_diff.vcl => test/fixtures/general_pv_diff.vcl (100%)
 rename general_pv_diff_quad.vcl => test/fixtures/general_pv_diff_quad.vcl (100%)
 rename general_pv_diff_tri.vcl => test/fixtures/general_pv_diff_tri.vcl (100%)
 rename general_quad.vcl => test/fixtures/general_quad.vcl (100%)
 rename general_tri.vcl => test/fixtures/general_tri.vcl (100%)
 rename indexed.vcl => test/fixtures/indexed.vcl (100%)
 delete mode 100644 tundra.lua

diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
index 5d1db44..8ddfb07 100644
--- a/.github/workflows/compilation.yml
+++ b/.github/workflows/compilation.yml
@@ -18,17 +18,9 @@ jobs:
         apk update
         apk add build-base make git cmake
 
-    - name: Compile masp
+    - name: Compile OpenVCL and examples
       run: |
-        git clone https://github.com/fjtrujy/masp.git
-        cd masp
-        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PS2DEV"
-        cmake --build build -j $(getconf _NPROCESSORS_ONLN)
-        cmake --install build
-
-    - name: Compile OpenVCL
-      run: |
-        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PS2DEV"
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PS2DEV" -DBUILD_EXAMPLES=ON
         cmake --build build -j $(getconf _NPROCESSORS_ONLN)
 
     - name: Run OpenVCL tests
@@ -39,10 +31,6 @@ jobs:
       run: |
         cmake --install build
 
-    - name: Build PS2 examples
-      run: |
-        make -C examples all
-
     - name: Get short SHA
       id: slug
       run: echo "sha8=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_OUTPUT
diff --git a/.gitignore b/.gitignore
index baf7c69..a584b60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ openvcl
 t2-output
 
 *.o
+*.vo
 *.elf
 *.vsm
 !test/fixtures/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 949bada..ea0d812 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,3 +45,15 @@ include(CTest)
 if(BUILD_TESTING)
     add_subdirectory(test)
 endif()
+
+# PS2 examples – require PS2SDK environment variable and the PS2 toolchain.
+# Enabled automatically when $PS2SDK is set; override with -DBUILD_EXAMPLES=ON/OFF.
+if(DEFINED ENV{PS2SDK})
+    option(BUILD_EXAMPLES "Build PS2 examples (requires PS2SDK toolchain)" ON)
+else()
+    option(BUILD_EXAMPLES "Build PS2 examples (requires PS2SDK toolchain)" OFF)
+endif()
+
+if(BUILD_EXAMPLES)
+    add_subdirectory(examples)
+endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 0000000..c6d94a5
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,23 @@
+set(_EXAMPLES pdk sprite triangle triangle-gasp triangle_strip)
+
+foreach(_example IN LISTS _EXAMPLES)
+    string(REPLACE "-" "_" _target_name "${_example}")
+    add_custom_target(example_${_target_name}
+        COMMAND ${CMAKE_MAKE_PROGRAM}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_example}
+        COMMENT "Building example: ${_example}"
+        VERBATIM
+    )
+    add_dependencies(example_${_target_name} openvcl)
+    list(APPEND _EXAMPLE_TARGETS example_${_target_name})
+endforeach()
+
+# sprite, triangle, triangle-gasp, and triangle_strip all link against libpdk.a
+foreach(_dep sprite triangle triangle_gasp triangle_strip)
+    add_dependencies(example_${_dep} example_pdk)
+endforeach()
+
+add_custom_target(examples ALL
+    DEPENDS ${_EXAMPLE_TARGETS}
+    COMMENT "Building all PS2 examples"
+)
diff --git a/examples/Makefile b/examples/Makefile
new file mode 100644
index 0000000..218f0af
--- /dev/null
+++ b/examples/Makefile
@@ -0,0 +1,15 @@
+SUBDIRS = pdk sprite triangle triangle-gasp triangle_strip
+
+all:
+	$(MAKE) -C pdk
+	$(MAKE) -C sprite
+	$(MAKE) -C triangle
+	$(MAKE) -C triangle-gasp
+	$(MAKE) -C triangle_strip
+
+clean:
+	$(MAKE) -C pdk clean
+	$(MAKE) -C sprite clean
+	$(MAKE) -C triangle clean
+	$(MAKE) -C triangle-gasp clean
+	$(MAKE) -C triangle_strip clean
diff --git a/fast_nolights.vo b/fast_nolights.vo
deleted file mode 100644
index b4ca17f1b5d1b1cf41edf4ec5e34a03f5d2091fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2256
zcmdT`OHUI~6h5~zl;L4gqEU>*l!rnEYk8PZK^f%{0z|7M#*LOj5lC7}n2|ulP}atc
zE?w#mFwu=kEhK78bjcs!6<mOc3r$==>OJS)Tc!<0!_J!w-+cFc_nUL(o;zisd!UCg
z25K-cV4neu7XsA4Q*R3i>Y#|nufRIXxBxm}jnIS*!mF@JcnLldw!>LK9Uq+>lkFNL
z?=^ZkUC8pV&kHy|@7rSVJ=3Lh!z{^yP)qACw{<7cCj(}`ir;1E164SW>vz~HLu_yf
zj7eMx0?i-2mL%O^p9$^tpBKftbL5NbQo(i7y)y--dj<C26qpLG$+*CDufWG4fvMnz
zj0;Tn3hWOFOa(V(TwuCa;Fpj<o{x!nU|uOVBP=jn9^~H)jSvjI2>Dc*PVrYhfm4kF
z`{n!Jt#(uVr<~tw)2ZG}?S_Wy3k;q7nBgYW1BHYc%@EH4pFq8s&<iDk2gLqjp7WJo
z*=}1YJ;xp?CRF*?g^q;qIf~mOMHGKCVh{!_kuMC@7o$!aI#0OU)^MQT=|lSs9O!rK
z(0;K4{fhtKXAjGI`((YQtk)FvvVeI1>OHM=xNkY%8+bm5bA<irll|k7{bL9$Il0PG
z+9vJqlI$P!tEgP2etT5;iGioaK;KO5RvF@6b1l{3Y8Cy!0s>u*=T%fKGcey%zi1xO
zhg!MlLzVCL1y@eKJF;JQkBdH*x@=#obuS9Rbk>=#!-M_54d*vg<6qDsM*$kRpe%=L
zP@cneIFrK*;G%<jxZe%VhjcON*=8{2hy&+wjH@I#f0)M?IsfH|Kgr|II3L&e9~^xB
zOAb!{I*&i+yj<pk`nP!;{4)>i(ODZY8nGjY!<Gg9uG=AhVkS0cM~3%_WltlYvEn@u
z%f6l%m>3(kt#D@|Iyz`artJeG-IGyt^#>pxnV1a65{apBY(mU6LL@pe;GAj7&O{TF
zqa>WYpO}v4u4^Vo{$uC2=His1OwDhNtGh!K#$V1qj#FHR+vJvd`rR#XES7s%Ep=+k
zTAUgg!&UYCGWhj3T@%-Me`FR^i{$&^R+sXtLwY%N>Yj%vcZK{@lO3%*KQ9;Ze<!Fm
i^z-lw&xy*7-@+YU_!8d8p}g_@ICUqu5uOP(l<qgD)1F)a

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8ccdf0f..7e7b7b2 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -105,8 +105,20 @@ target_compile_definitions(openvcl_unit_tests PRIVATE
 # themselves don't need -Isrc because their own #include "Foo.h" directives
 # resolve via the source file's own directory.  Test files reach openvcl
 # headers via explicit relative paths like #include "../src/Expression.h".
+# OpenVclVersion.h is generated by configure_file; reproduce it here so both
+# standalone (cmake -S test) and integrated (add_subdirectory) builds work.
+# CMAKE_PROJECT_VERSION is the top-level project version when built from root,
+# and empty when built standalone (acceptable for test purposes).
+set(PROJECT_VERSION "${CMAKE_PROJECT_VERSION}")
+configure_file(
+    "${OPENVCL_ROOT}/src/OpenVclVersion.h.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/OpenVclVersion.h"
+    @ONLY
+)
+
 target_include_directories(openvcl_unit_tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 # The library code was written for an older C++ dialect; silence the warnings
diff --git a/fast.vcl b/test/fixtures/fast.vcl
similarity index 100%
rename from fast.vcl
rename to test/fixtures/fast.vcl
diff --git a/fast_nolights.vcl b/test/fixtures/fast_nolights.vcl
similarity index 100%
rename from fast_nolights.vcl
rename to test/fixtures/fast_nolights.vcl
diff --git a/general.vcl b/test/fixtures/general.vcl
similarity index 100%
rename from general.vcl
rename to test/fixtures/general.vcl
diff --git a/general_nospec.vcl b/test/fixtures/general_nospec.vcl
similarity index 100%
rename from general_nospec.vcl
rename to test/fixtures/general_nospec.vcl
diff --git a/general_nospec_quad.vcl b/test/fixtures/general_nospec_quad.vcl
similarity index 100%
rename from general_nospec_quad.vcl
rename to test/fixtures/general_nospec_quad.vcl
diff --git a/general_nospec_tri.vcl b/test/fixtures/general_nospec_tri.vcl
similarity index 100%
rename from general_nospec_tri.vcl
rename to test/fixtures/general_nospec_tri.vcl
diff --git a/general_pv_diff.vcl b/test/fixtures/general_pv_diff.vcl
similarity index 100%
rename from general_pv_diff.vcl
rename to test/fixtures/general_pv_diff.vcl
diff --git a/general_pv_diff_quad.vcl b/test/fixtures/general_pv_diff_quad.vcl
similarity index 100%
rename from general_pv_diff_quad.vcl
rename to test/fixtures/general_pv_diff_quad.vcl
diff --git a/general_pv_diff_tri.vcl b/test/fixtures/general_pv_diff_tri.vcl
similarity index 100%
rename from general_pv_diff_tri.vcl
rename to test/fixtures/general_pv_diff_tri.vcl
diff --git a/general_quad.vcl b/test/fixtures/general_quad.vcl
similarity index 100%
rename from general_quad.vcl
rename to test/fixtures/general_quad.vcl
diff --git a/general_tri.vcl b/test/fixtures/general_tri.vcl
similarity index 100%
rename from general_tri.vcl
rename to test/fixtures/general_tri.vcl
diff --git a/indexed.vcl b/test/fixtures/indexed.vcl
similarity index 100%
rename from indexed.vcl
rename to test/fixtures/indexed.vcl
diff --git a/test/integration/test_cli.cpp b/test/integration/test_cli.cpp
index 164571e..4d6591e 100644
--- a/test/integration/test_cli.cpp
+++ b/test/integration/test_cli.cpp
@@ -1,7 +1,7 @@
 #include "test_harness.h"
 #include "openvcl_runner.h"
 
-#include "../../src/OpenVclVersion.h"
+#include "OpenVclVersion.h"
 
 #include <string>
 #include <vector>
diff --git a/tundra.lua b/tundra.lua
deleted file mode 100644
index 46fd26b..0000000
--- a/tundra.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-local common = {
-	Env = {
-		CCOPTS = { "-ansi", "-pedantic", "-Werror", "-g", Config = "*-gcc-*" },
-		LIBS = { "stdc++", Config = { "*-clang", "*-gcc-*" } }
-	}
-}
-
-Build {
-	Units = function()
-		Program {
-			Name = "openvcl",
-			Sources = { Glob { Dir = "src", Extensions = { ".c", ".cpp", ".h" } } }
-		}
-
-		Default "openvcl"
-	end,
-	SyntaxExtensions = { "tundra.syntax.glob" },
-	Configs = {
-		Config { Name = "macosx-clang", Inherit = common, Tools = { "clang-osx" }, DefaultOnHost = "macosx" },
-		Config { Name = "macosx-gcc", Inherit = common, Tools = { "gcc-osx" } },
-		Config { Name = "win32-msvc", Inherit = common, Tools = { { "msvc-winsdk"; TargetArch = "x86" } } },
-		Config { Name = "win64-msvc", Inherit = common, Tools = { { "msvc-winsdk"; TargetArch = "x64" } } },
-		Config { Name = "linux-gcc", Inherit = common, Tools = { "gcc" } },
-	},
-}