From 0e365205e993a40311fe21cf8396f0573ccd6c74 Mon Sep 17 00:00:00 2001 From: Lock l00p Date: Fri, 29 Sep 2023 22:56:23 +0000 Subject: [PATCH] YES IT WORKS IT WORKS IT COMPILES IT WORKS IT WORKS YESYESYESYESYES --- .gitignore | 1 + makefile | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5ba9ca0f..b80eb440 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ ChangeLog darkplaces-agl darkplaces-glx darkplaces-sdl +darkplaces-emscripten.html darkplaces-dedicated gmon.out *.ncb diff --git a/makefile b/makefile index 313be24c..fdf3bd86 100644 --- a/makefile +++ b/makefile @@ -95,8 +95,8 @@ ifeq ($(DP_MAKE_TARGET), linux) OBJ_ICON= OBJ_ICON_NEXUIZ= - LDFLAGS_SV="$(LDFLAGS_LINUXSV) $(LDFLAGS_EXTRASV)" - LDFLAGS_SDL="$(LDFLAGS_LINUXSDL) $(LDFLAGS_EXTRA)" + LDFLAGS_SV=$(LDFLAGS_LINUXSV) $(LDFLAGS_EXTRASV) + LDFLAGS_SDL=$(LDFLAGS_LINUXSDL) $(LDFLAGS_EXTRA) SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11) SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11) @@ -121,8 +121,8 @@ ifeq ($(DP_MAKE_TARGET), macosx) OBJ_ICON= OBJ_ICON_NEXUIZ= - LDFLAGS_SV="$(LDFLAGS_MACOSXSV) $(LDFLAGS_EXTRASV)" - LDFLAGS_SDL="$(LDFLAGS_MACOSXSDL) $(LDFLAGS_EXTRA)"" + LDFLAGS_SV=$(LDFLAGS_MACOSXSV) $(LDFLAGS_EXTRASV) + LDFLAGS_SDL=$(LDFLAGS_MACOSXSDL) $(LDFLAGS_EXTRA) SDLCONFIG_CFLAGS=$(SDLCONFIG_MACOSXCFLAGS) SDLCONFIG_LIBS=$(SDLCONFIG_MACOSXLIBS) @@ -161,8 +161,8 @@ ifeq ($(DP_MAKE_TARGET), sunos) CFLAGS_EXTRA=$(CFLAGS_SUNOS) - LDFLAGS_SV="$(LDFLAGS_SUNOSSV) $(LDFLAGS_EXTRASV)" - LDFLAGS_SDL="$(LDFLAGS_SUNOSSDL) $(LDFLAGS_EXTRA)" + LDFLAGS_SV=$(LDFLAGS_SUNOSSV) $(LDFLAGS_EXTRASV) + LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL) $(LDFLAGS_EXTRA) SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11) SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11) @@ -188,8 +188,8 @@ ifeq ($(DP_MAKE_TARGET), bsd) OBJ_ICON= OBJ_ICON_NEXUIZ= - LDFLAGS_SV="$(LDFLAGS_BSDSV) $(LDFLAGS_EXTRASV)" - LDFLAGS_SDL="$(LDFLAGS_BSDSDL) $(LDFLAGS_EXTRA)" + LDFLAGS_SV=$(LDFLAGS_BSDSV) $(LDFLAGS_EXTRASV) + LDFLAGS_SDL=$(LDFLAGS_BSDSDL) $(LDFLAGS_EXTRA) SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11) SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11) @@ -234,8 +234,8 @@ ifeq ($(DP_MAKE_TARGET), mingw) OBJ_ICON=darkplaces.o OBJ_ICON_NEXUIZ=nexuiz.o - LDFLAGS_SV="$(LDFLAGS_WINSV) $(LDFLAGS_EXTRASV)" - LDFLAGS_SDL="$(LDFLAGS_WINSDL) $(LDFLAGS_EXTRA)" + LDFLAGS_SV=$(LDFLAGS_WINSV) $(LDFLAGS_EXTRASV) + LDFLAGS_SDL=$(LDFLAGS_WINSDL) $(LDFLAGS_EXTRA) SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) -- 2.39.2