Skip to content

Commit fa4983b

Browse files
committed
Try to generate vsm in the CI
1 parent c548a67 commit fa4983b

11 files changed

+18
-5539
lines changed

.github/workflows/compilation.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- name: Install dependencies
1717
run: |
18-
apk add build-base git
18+
apk add build-base git cmake
1919
2020
- name: Install ps2stuff
2121
run: |
@@ -25,6 +25,21 @@ jobs:
2525
make -j $(getconf _NPROCESSORS_ONLN) all
2626
make -j $(getconf _NPROCESSORS_ONLN) install
2727
28+
- name: Install masp
29+
run: |
30+
git clone https://github.com/fjtrujy/masp.git
31+
cd masp
32+
cmake -B build-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=$PS2DEV
33+
cmake --build build-cmake --config RelWithDebInfo --target install
34+
35+
- name: Install openvcl
36+
run: |
37+
git clone https://github.com/fjtrujy/openvcl.git
38+
cd openvcl
39+
make -j $(getconf _NPROCESSORS_ONLN) clean
40+
make -j $(getconf _NPROCESSORS_ONLN) all
41+
make -j $(getconf _NPROCESSORS_ONLN) install
42+
2843
- name: Compile project
2944
run: |
3045
make -j $(getconf _NPROCESSORS_ONLN) clean

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ include $(PS2SDK)/samples/Makefile.eeglobal
8080
dvp-as -o $@ $<
8181

8282
%_vcl.vsm: %_pp4.vcl
83-
vcl -o$@ $<
83+
openvcl -o$@ $<
8484

8585
%indexed_pp4.vcl: %indexed_pp3.vcl
8686
cat $< | cc -E -P -imacros vu1/vu1_mem_indexed.h -o $@ -
@@ -92,7 +92,7 @@ include $(PS2SDK)/samples/Makefile.eeglobal
9292
cat $< | sed 's/\[\([0-9]\)\]/_\1/g ; s/\[\([w-zW-Z]\)\]/\1/g' - > $@
9393

9494
%_pp2.vcl: %_pp1.vcl
95-
gasp -c ';' -Ivu1 -o $@ $<
95+
masp -c ';' -Ivu1 -o $@ $<
9696

9797
%_pp1.vcl: %.vcl
9898
cat $< | sed 's/#include[ ]\+.\+// ; s/#define[ ]\+.\+// ; s|\(\.include[ ]\+\)"\([^/].\+\)"|\1"$(<D)/\2"|' - > $@

vu1/general_nospec_quad_vcl.vsm

Lines changed: 0 additions & 593 deletions
This file was deleted.

vu1/general_nospec_tri_vcl.vsm

Lines changed: 0 additions & 490 deletions
This file was deleted.

vu1/general_nospec_vcl.vsm

Lines changed: 0 additions & 570 deletions
This file was deleted.

vu1/general_pv_diff_quad_vcl.vsm

Lines changed: 0 additions & 714 deletions
This file was deleted.

vu1/general_pv_diff_tri_vcl.vsm

Lines changed: 0 additions & 688 deletions
This file was deleted.

vu1/general_pv_diff_vcl.vsm

Lines changed: 0 additions & 769 deletions
This file was deleted.

vu1/general_tri_vcl.vsm

Lines changed: 0 additions & 689 deletions
This file was deleted.

vu1/general_vcl.vsm

Lines changed: 0 additions & 771 deletions
This file was deleted.

0 commit comments

Comments
 (0)