remove dependency on SDL2_gfx

gwenhael-le-moine · Sep 9, 2024 · 4d4867a · 4d4867a
1 parent d91939f
commit 4d4867a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -16,7 +16,7 @@ jobs:
     - name: update deps
       run: sudo apt-get -y update
     - name: install deps
-      run: sudo apt install pkgconf libreadline-dev libsdl2-gfx-dev libsdl2-dev libx11-dev libxext-dev liblua5.4-dev
+      run: sudo apt install pkgconf libreadline-dev libsdl2-dev libx11-dev libxext-dev liblua5.4-dev
     - name: make standard
       run: make clean-all && make
     - name: make without any sdl

diff --git a/Makefile b/Makefile
@@ -111,8 +111,8 @@ ifeq ($(WITH_SDL), yes)
 	WITH_SDL2 = yes
 endif
 ifeq ($(WITH_SDL2), yes)
-	SDLCFLAGS = $(shell "$(PKG_CONFIG)" --cflags sdl2 SDL2_gfx)
-	SDLLIBS = $(shell "$(PKG_CONFIG)" --libs sdl2 SDL2_gfx)
+	SDLCFLAGS = $(shell "$(PKG_CONFIG)" --cflags sdl2)
+	SDLLIBS = $(shell "$(PKG_CONFIG)" --libs sdl2)
 
 	override CFLAGS += $(SDLCFLAGS) -DHAS_SDL2=1
 	LIBS += $(SDLLIBS)

diff --git a/src/ui_sdl2.c b/src/ui_sdl2.c
@@ -10,7 +10,6 @@
 #include <unistd.h>
 
 #include <SDL2/SDL.h>
-#include <SDL2/SDL2_gfxPrimitives.h> /* stringRGBA(); */
 
 #include "romio.h" /* opt_gx */
 #include "config.h"