Fixing up CI build stuff

nicholas477 · Nov 22, 2023 · 41f8702 · 41f8702
1 parent 5b35c3a
commit 41f8702
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -20,12 +20,12 @@ jobs:
     - name: Install ps2stuff
       run: |
         git clone https://github.com/ps2dev/ps2stuff.git dependencies/ps2stuff
-        cd dependencies/ps2stuff && make clean all install
+        cd dependencies/ps2stuff && make clean all install -j$(getconf _NPROCESSORS_ONLN)
 
     - name: Install ps2gl
       run: |
         git clone https://github.com/ps2dev/ps2gl.git dependencies/ps2gl
-        cd dependencies/ps2gl && make clean all install
+        cd dependencies/ps2gl && make clean all install -j$(getconf _NPROCESSORS_ONLN)
 
     - name: Install meshoptimizer
       run: |
@@ -34,9 +34,9 @@ jobs:
         mkdir -p build
         cd build
         cmake ..
-        make clean all install
+        make clean all install -j$(getconf _NPROCESSORS_ONLN)
 
     - name: Compile egg-library
       run: |
         cd dependencies/egg-library
-        make clean all install
+        make clean all install -j$(getconf _NPROCESSORS_ONLN)
diff --git a/dependencies/egg-library/Makefile b/dependencies/egg-library/Makefile
@@ -21,7 +21,7 @@ $(EE_OBJS_DIR)%.o : $(EE_SRC_DIR)%.c
 	$(EE_C_COMPILE) -DIOAPI_NO_64 -c $< -o $@
 
 install: all
-	mkdir -p $(DESTDIR)$(PS2SDK)/ports/include
+	mkdir -p $(DESTDIR)$(PS2SDK)/ports/include/egg/
 	mkdir -p $(DESTDIR)$(PS2SDK)/ports/lib
 	cp -f $(EE_LIB) $(DESTDIR)$(PS2SDK)/ports/lib
 	cp -f include/egg/*.hpp $(DESTDIR)$(PS2SDK)/ports/include/egg/