gwh/libx48ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove dependency on SDL2_gfx

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-09-09 20:54:47 +02:00
parent d91939f58a
commit 4d4867a9fc
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/c-cpp.yml vendored
View file

@ -16,7 +16,7 @@ jobs:
- name: update deps - name: update deps
run: sudo apt-get -y update run: sudo apt-get -y update
- name: install deps - 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 - name: make standard
run: make clean-all && make run: make clean-all && make
- name: make without any sdl - name: make without any sdl

4
Makefile
View file

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

1
src/ui_sdl2.c
View file

@ -10,7 +10,6 @@
#include <unistd.h> #include <unistd.h>
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <SDL2/SDL2_gfxPrimitives.h> /* stringRGBA(); */
#include "romio.h" /* opt_gx */ #include "romio.h" /* opt_gx */
#include "config.h" #include "config.h"