Merge pull request #1359 from Wolf3s/gfx-deprecated-functions

Remove .bmp and .jpg support from OPL.
ps2homebrew · Oct 31, 2024 · 5a3ef8a · 5a3ef8a
2 parents 9996f1f + 6075a2a
commit 5a3ef8a
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 149 deletions.
diff --git a/Makefile b/Makefile
@@ -126,9 +126,8 @@ PNG_ASSETS_DIR = gfx/
 MAPFILE = opl.map
 EE_LDFLAGS += -Wl,-Map,$(MAPFILE)
 
-EE_LIBS = -L$(PS2SDK)/ports/lib -L$(GSKIT)/lib -L./lib -lgskit -ldmakit -lgskit_toolkit -lpoweroff -lfileXio -lpatches -ljpeg_ps2_addons -ljpeg -lpng -lz -lmc -lfreetype -lvux -lcdvd -lnetman -lps2ips -laudsrv -lvorbisfile -lvorbis -logg -lpadx -lelf-loader-nocolour
-EE_INCS += -I$(PS2SDK)/ports/include -I$(PS2SDK)/ports/include/freetype2 -I$(GSKIT)/include -I$(GSKIT)/ee/dma/include -I$(GSKIT)/ee/gs/include -I$(GSKIT)/ee/toolkit/include -Imodules/iopcore/common -Imodules/network/common -Imodules/hdd/common -Iinclude
-
+EE_LIBS = -L$(PS2SDK)/ports/lib -L$(GSKIT)/lib -L./lib -lgskit -ldmakit -lpoweroff -lfileXio -lpatches -lpng -lz -lmc -lfreetype -lvux -lcdvd -lnetman -lps2ips -laudsrv -lvorbisfile -lvorbis -logg -lpadx -lelf-loader-nocolour
+EE_INCS += -I$(PS2SDK)/ports/include -I$(PS2SDK)/ports/include/freetype2 -I$(GSKIT)/include -I$(GSKIT)/ee/dma/include -I$(GSKIT)/ee/gs/include -Imodules/iopcore/common -Imodules/network/common -Imodules/hdd/common -Iinclude
 BIN2C = $(PS2SDK)/bin/bin2c
 
 # WARNING: Only extra spaces are allowed and ignored at the beginning of the conditional directives (ifeq, ifneq, ifdef, ifndef, else and endif)

diff --git a/include/atlas.h b/include/atlas.h
@@ -1,8 +1,6 @@
 #ifndef __ATLAS_H
 #define __ATLAS_H
 
-#include <gsToolkit.h>
-
 struct atlas_allocation_t
 {
     int x, y;

diff --git a/include/fntsys.h b/include/fntsys.h
@@ -1,8 +1,6 @@
 #ifndef __FNTSYS_H
 #define __FNTSYS_H
 
-#include <gsToolkit.h>
-
 /// default (built-in) font id
 #define FNT_DEFAULT (0)
 /// Value returned on errors

diff --git a/include/menusys.h b/include/menusys.h
@@ -1,7 +1,6 @@
 #ifndef __MENUSYS_H
 #define __MENUSYS_H
 
-#include <gsToolkit.h>
 #include "include/config.h"
 #include "include/dia.h"
 

diff --git a/include/opl.h b/include/opl.h
@@ -26,7 +26,6 @@
 #include <debug.h>
 #include <gsKit.h>
 #include <dmaKit.h>
-#include <gsToolkit.h>
 #include <malloc.h>
 #include <math.h>
 #include <osd_config.h>

diff --git a/include/renderman.h b/include/renderman.h
@@ -1,8 +1,6 @@
 #ifndef __RENDERMAN_H
 #define __RENDERMAN_H
 
-#include <gsToolkit.h>
-
 /*
  * Rendering using renderman
  *

diff --git a/include/texcache.h b/include/texcache.h
@@ -1,7 +1,6 @@
 #ifndef __TEX_CACHE_H
 #define __TEX_CACHE_H
 
-#include <gsToolkit.h>
 #include "include/iosupport.h"
 
 /// A single cache entry...

diff --git a/include/util.h b/include/util.h
@@ -1,8 +1,6 @@
 #ifndef __UTIL_H
 #define __UTIL_H
 
-#include <gsToolkit.h>
-
 int getmcID(void);
 int getFileSize(int fd);
 void checkMCFolder(void);

diff --git a/src/atlas.c b/src/atlas.c
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <malloc.h>
+#include "include/opl.h"
 #include "include/atlas.h"
 #include "include/renderman.h"
 

diff --git a/src/renderman.c b/src/renderman.c
@@ -7,9 +7,9 @@
 #include <stdio.h>
 #include <kernel.h>
 
+#include "include/opl.h"
 #include "include/renderman.h"
 #include "include/ioman.h"
-#include "include/opl.h"
 
 // Allocateable space in vram, as indicated in GsKit's code
 #define __VRAM_SIZE 4194304