YES IT WORKS IT WORKS IT COMPILES IT WORKS IT WORKS YESYESYESYESYES

diff --git a/.gitignore b/.gitignore
index 5ba9ca0f22b30415bea8d957208fbf017f9c81c6..b80eb4408d9ee8ed225aa0d15919ecc25eb705b7 100644 (file)
--- 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 313be24cc6ae75638b23693b40e15957a9f9e68e..fdf3bd863f345242216667a094441ea9e546f70c 100644 (file)
--- 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)