X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=makefile;h=7d3f73a3f29b043860cfe1df3b861504acfde199;hb=836e971163f6066cb5fae873b9a456753f79a18c;hp=ee88a37c4dabea2a868fa31a66fc7d03b981b4ee;hpb=9b483e302a32f2e76f55dc2660e17d7f7c5e96cb;p=xonotic%2Fdarkplaces.git diff --git a/makefile b/makefile index ee88a37c..7d3f73a3 100644 --- a/makefile +++ b/makefile @@ -61,9 +61,9 @@ ifeq ($(DP_MAKE_TARGET), linux) LDFLAGS_SV=$(LDFLAGS_LINUXSV) LDFLAGS_SDL=$(LDFLAGS_LINUXSDL) - SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) - SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) - SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) + SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11) + SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11) + SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11) EXE_CL=$(EXE_UNIXCL) EXE_SV=$(EXE_UNIXSV) @@ -126,9 +126,9 @@ ifeq ($(DP_MAKE_TARGET), sunos) LDFLAGS_SV=$(LDFLAGS_SUNOSSV) LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL) - SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) - SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) - SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) + SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11) + SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11) + SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11) EXE_CL=$(EXE_UNIXCL) EXE_SV=$(EXE_UNIXSV) @@ -159,9 +159,9 @@ endif LDFLAGS_SV=$(LDFLAGS_BSDSV) LDFLAGS_SDL=$(LDFLAGS_BSDSDL) - SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) - SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) - SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) + SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11) + SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11) + SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11) EXE_CL=$(EXE_UNIXCL) EXE_SV=$(EXE_UNIXSV)