remove dependency on SDL2_gfx
This commit is contained in:
parent
d91939f58a
commit
4d4867a9fc
3 changed files with 3 additions and 4 deletions
2
.github/workflows/c-cpp.yml
vendored
2
.github/workflows/c-cpp.yml
vendored
|
@ -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
|
||||
|
|
4
Makefile
4
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)
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue