quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rudolf Polzer 2012-01-14 00:32:48 +01:00
parent 57d64f977f 34dd9340fc
commit 326b154fca
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -178,7 +178,7 @@ else
ifeq ($(OS),Win32) ifeq ($(OS),Win32)
CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline
CFLAGS_COMMON += -mms-bitfields CFLAGS_COMMON += -mms-bitfields
LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias LDFLAGS_DLL = -Wl,--add-stdcall-alias
LIBS_COMMON = -lws2_32 -luser32 -lgdi32 -lole32 LIBS_COMMON = -lws2_32 -luser32 -lgdi32 -lole32
EXE ?= exe EXE ?= exe
A = a A = a

2
cross-Makefile.conf
View File

@ -3,7 +3,7 @@
# edit the paths in here # edit the paths in here
# how to call the mingw tools # how to call the mingw tools
MINGW_EXEC_PREFIX = i586-mingw32msvc- MINGW_EXEC_PREFIX = i486-mingw32-
# use mingw32 # use mingw32
include mingw-Makefile.inc include mingw-Makefile.inc

2
install-dlls.sh
View File

@ -33,6 +33,8 @@ for DLL in \
libpng14-14.dll \ libpng14-14.dll \
libxml2-2.dll \ libxml2-2.dll \
zlib1.dll \ zlib1.dll \
libgcc_s_sjlj-1.dll \
libstdc++-6.dll \
; do ; do
$CP "`$WHICHDLL $DLL`" $INSTALLDIR/ $CP "`$WHICHDLL $DLL`" $INSTALLDIR/
done done