mirror of
https://github.com/Garux/netradiant-custom.git
synced 2026-09-28 00:00:03 +02:00
Merge branch 'master' of git://de.git.xonotic.org/xonotic/netradiant
This commit is contained in:
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user