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

autodetection of x11 and sdl was flaky

Browse source
This commit is contained in:
Gwenhael Le Moine 2023-09-28 09:46:29 +02:00
parent b5ef477f60
commit 893de1b4be
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Makefile
View file

@ -41,24 +41,22 @@ DOTOS = src/emu_serial.o \
### X11 UI ### X11 UI
ifeq ($(WITH_X11), yes) ifeq ($(WITH_X11), yes)
X11CFLAGS = $(shell pkg-config --cflags x11 xext) -D_GNU_SOURCE=1 X11CFLAGS = $(shell pkg-config --cflags x11 xext) -D_GNU_SOURCE=1
X11LIBS = $(shell pkg-config --libs x11 xext) X11LIBS = $(shell pkg-config --libs x11 xext)
ifneq ($(X11LIBS), "")
CFLAGS += $(X11CFLAGS) -DHAS_X11=1 CFLAGS += $(X11CFLAGS) -DHAS_X11=1
LIBS += $(X11LIBS) LIBS += $(X11LIBS)
DOTOS += src/ui_x11.o DOTOS += src/ui_x11.o
endif
endif endif
### SDL UI ### SDL UI
ifeq ($(WITH_SDL), yes) ifeq ($(WITH_SDL), yes)
SDLCFLAGS = $(shell pkg-config --cflags SDL_gfx sdl12_compat) SDLCFLAGS = $(shell pkg-config --cflags SDL_gfx sdl12_compat)
SDLLIBS = $(shell pkg-config --libs SDL_gfx sdl12_compat) SDLLIBS = $(shell pkg-config --libs SDL_gfx sdl12_compat)
ifneq (,$(findstring "lSDL", $(SDLLIBS)))
CFLAGS += $(SDLCFLAGS) -DHAS_SDL=1 CFLAGS += $(SDLCFLAGS) -DHAS_SDL=1
LIBS += $(SDLLIBS) LIBS += $(SDLLIBS)
DOTOS += src/ui_sdl.o DOTOS += src/ui_sdl.o
endif
endif endif
### Text UI ### Text UI