- Use packaged gxtexconv.

emukidid · Apr 16, 2024 · 94b9e81 · 94b9e81
1 parent 6a06ad9
commit 94b9e81
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 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-libmad ppc-libpsoarchive ppc-libxxhash ppc-zlib-ng-compat
+        sudo dkp-pacman -S --noconfirm --ask 4 gamecube-tools-git libogc2-git ppc-libmad ppc-libpsoarchive ppc-libxxhash ppc-zlib-ng-compat
 
     - name: Checkout Swiss
       uses: actions/checkout@main

diff --git a/buildtools/gxtexconv b/buildtools/gxtexconv
diff --git a/buildtools/gxtexconv.exe b/buildtools/gxtexconv.exe
diff --git a/cube/swiss/Makefile b/cube/swiss/Makefile
@@ -9,14 +9,6 @@ endif
 
 include $(DEVKITPRO)/libogc2/gamecube_rules
 
-BUILDTOOLS	:=	$(shell git rev-parse --show-toplevel)/buildtools
-
-ifeq ($(OS),Windows_NT)
-GXTEXCONV	:=	$(BUILDTOOLS)/gxtexconv.exe
-else
-GXTEXCONV	:=	$(BUILDTOOLS)/gxtexconv
-endif
-
 #---------------------------------------------------------------------------------
 # TARGET is the name of the output
 # BUILD is the directory where object files & intermediate files will be placed
@@ -172,12 +164,6 @@ $(OFILES_SOURCES) : $(HFILES)
 	$(SILENTMSG) $(notdir $<)
 	$(bin2o)
 
-#---------------------------------------------------------------------------------
-%.tpl : %.scf
-#---------------------------------------------------------------------------------
-	$(SILENTMSG) $(notdir $<)
-	$(SILENTCMD)$(GXTEXCONV) -s $< -d $(DEPSDIR)/$*.d -o $@
-
 -include $(DEPENDS)
 
 #---------------------------------------------------------------------------------