Merge branch 'master' of git://de.git.xonotic.org/xonotic/netradiant

diff --combined Makefile
index 5c187b134e27635907d01db70269a984fdf094bc,ba2e9b0aff3e8e219823cb42724bd92f2c2cdb84..3323a90da34369b40826316e9d4bb0cc0e5bd1b1
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -178,7 -178,7 +178,7 @@@ els
  ifeq ($(OS),Win32)
        CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline
        CFLAGS_COMMON += -mms-bitfields
-       LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias
+       LDFLAGS_DLL = -Wl,--add-stdcall-alias
        LIBS_COMMON = -lws2_32 -luser32 -lgdi32 -lole32
        EXE ?= exe
        A = a
@@@ -450,7 -450,7 +450,7 @@@ endi
  %.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check
        $(CXX) $< $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@
  
 -%.o: %.c dependencies-check $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check
 +%.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check
        $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@