Updates after including masp and openvcl in the toolchain

Author: fjtrujy

.github/workflows/compilation.yml

@@ -32,22 +32,6 @@ jobs:
         make -j $(getconf _NPROCESSORS_ONLN)
         make install
 
-    - name: Compile masp
-      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: Install openvcl
-      run: |
-        git clone https://github.com/fjtrujy/openvcl.git
-        cd openvcl
-        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PS2DEV" -DBUILD_TESTING=OFF
-        cmake --build build -j $(getconf _NPROCESSORS_ONLN)
-        cmake --install build
-
 
     - name: Configure with CMake
       run: |

CMakeLists.txt

@@ -387,20 +387,19 @@ endif()
 # ============================================================================
 # Install targets
 # ============================================================================
-install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/${EE_LIB}
-    DESTINATION "${PS2SDK}/ports/lib"
+install(TARGETS ps2gl
+    ARCHIVE DESTINATION lib
 )
 
 install(
     DIRECTORY ${CMAKE_SOURCE_DIR}/include/GL
-    DESTINATION "${PS2SDK}/ports/include"
+    DESTINATION include
     FILES_MATCHING PATTERN "*.h"
 )
 
 install(
     DIRECTORY ${CMAKE_SOURCE_DIR}/include/ps2gl
-    DESTINATION "${PS2SDK}/ports/include"
+    DESTINATION include
     FILES_MATCHING PATTERN "*.h"
 )
 
@@ -436,7 +435,7 @@ message(STATUS "  Build GLUT: ${BUILD_GLUT}")
 message(STATUS "  Build examples: ${BUILD_EXAMPLES}")
 message(STATUS "  Build tests: ${BUILD_TESTS}")
 message(STATUS "  Output library: ${EE_LIB}")
-message(STATUS "  Install prefix: ${PS2SDK}/ports")
+message(STATUS "  Install prefix: ${CMAKE_INSTALL_PREFIX}")
 message(STATUS "  VU0 vectors: DISABLED")
 message(STATUS "  ASM optimizations: DISABLED")
 message(STATUS "  VU1 renderers: ${RENDERERS}")

glut/CMakeLists.txt

@@ -63,14 +63,13 @@ target_include_directories(ps2glut PUBLIC
 # ============================================================================
 # Install targets
 # ============================================================================
-install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/${EE_LIB}
-    DESTINATION "${PS2SDK}/ports/lib"
+install(TARGETS ps2glut
+    ARCHIVE DESTINATION lib
 )
 
 install(
     DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/GL
-    DESTINATION "${PS2SDK}/ports/include"
+    DESTINATION include
     FILES_MATCHING PATTERN "*.h"
 )