- Use packaged xxHash.

emukidid · Feb 17, 2024 · 7327e67 · 7327e67
1 parent 571d834
commit 7327e67
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6,826 deletions.
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
@@ -18,7 +18,7 @@ jobs:
         sudo sed -i '/^\[dkp-libs\]$/,$d' /opt/devkitpro/pacman/etc/pacman.conf
         sudo echo -e '[extremscorner-devkitpro]\nServer = https://packages.extremscorner.org/devkitpro/linux/$arch' >> /opt/devkitpro/pacman/etc/pacman.conf
         sudo dkp-pacman -Sy
-        sudo dkp-pacman -S --noconfirm --ask 4 libogc2-git ppc-libpsoarchive ppc-zlib-ng-compat
+        sudo dkp-pacman -S --noconfirm --ask 4 libogc2-git ppc-libmad ppc-libpsoarchive ppc-libxxhash ppc-zlib-ng-compat
 
     - name: Checkout Swiss
       uses: actions/checkout@main

diff --git a/cube/swiss/Makefile b/cube/swiss/Makefile
@@ -51,8 +51,7 @@ SOURCES		:=  source \
 			  source/patches/vi \
               source/images \
 			  source/images/buttons \
-			  source/fatfs \
-			  source/xxhash
+			  source/fatfs
 DATA		:=	data  
 TEXTURES	:=	source/images \
               source/images/buttons
@@ -71,7 +70,7 @@ LDFLAGS		= $(CFLAGS) -Wl,-Map,$(notdir $@).map -T ../../linker-script/ogc.ld -T
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
-LIBS	:=	-ltinysmb -lbba -laesnd -lmad -ldb -logc -lpsoarchive -lz
+LIBS	:=	-ltinysmb -lbba -laesnd -lmad -ldb -logc -lpsoarchive -lxxhash -lz
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing

diff --git a/cube/swiss/source/gcm.c b/cube/swiss/source/gcm.c
@@ -6,6 +6,8 @@
 #include <string.h>
 #include <math.h>
 #include <malloc.h>
+#include <psoarchive/PRS.h>
+#include <xxhash.h>
 #include "dvd.h"
 #include "elf.h"
 #include "gcm.h"
@@ -19,8 +21,6 @@
 #include "devices/deviceHandler.h"
 #include "gui/FrameBufferMagic.h"
 #include "gui/IPLFontWrite.h"
-#include "psoarchive/PRS.h"
-#include "xxhash/xxhash.h"
 
 #define FST_ENTRY_SIZE 12
 

diff --git a/cube/swiss/source/swiss.c b/cube/swiss/source/swiss.c
@@ -25,6 +25,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <time.h>
+#include <psoarchive/PRS.h>
+#include <xxhash.h>
 #include <zlib.h>
 
 #include "swiss.h"
@@ -49,8 +51,6 @@
 #include "devices/deviceHandler.h"
 #include "devices/filelock.h"
 #include "devices/filemeta.h"
-#include "psoarchive/PRS.h"
-#include "xxhash/xxhash.h"
 #include "dolparameters.h"
 #include "reservedarea.h"
 

diff --git a/cube/swiss/source/xxhash/xxhash.c b/cube/swiss/source/xxhash/xxhash.c