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

diff --git a/Makefile b/Makefile
index 5c187b134e27635907d01db70269a984fdf094bc..3323a90da34369b40826316e9d4bb0cc0e5bd1b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -178,7 +178,7 @@ else
 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

diff --git a/cross-Makefile.conf b/cross-Makefile.conf
index 2b44320d998e6a08251fdb76bbf3e68375f3dcbc..bf4ae3a83d95943c1a97eec7b9d0f10a530fa6bc 100644 (file)
--- a/cross-Makefile.conf
+++ b/cross-Makefile.conf
@@ -3,7 +3,7 @@
 # edit the paths in here
 
 # how to call the mingw tools
-MINGW_EXEC_PREFIX = i586-mingw32msvc-
+MINGW_EXEC_PREFIX = i486-mingw32-
 
 # use mingw32
 include mingw-Makefile.inc

diff --git a/install-dlls.sh b/install-dlls.sh
index f83e3862c1bac4facca73b1fa16dbc938ce5fabc..59ae421ea11263e956baff0c49ee316515af61aa 100755 (executable)
--- a/install-dlls.sh
+++ b/install-dlls.sh
@@ -33,6 +33,8 @@ for DLL in \
        libpng14-14.dll \
        libxml2-2.dll \
        zlib1.dll \
+       libgcc_s_sjlj-1.dll \
+       libstdc++-6.dll \
 ; do
        $CP "`$WHICHDLL $DLL`" $INSTALLDIR/
 done