From 8ecf001ea472d7eca1912b6c6bc02508f4c24fd1 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 13 Jan 2012 23:28:18 +0100 Subject: [PATCH 1/3] better fit mingw on Arch Linux --- Makefile | 2 +- cross-Makefile.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5a9f2923..0fc502ed 100644 --- 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 = -mdll -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 2b44320d..bf4ae3a8 100644 --- 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 From 7343cc1f7e4f83384fa175cb6c321cdaaea05265 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 13 Jan 2012 23:42:48 +0100 Subject: [PATCH 2/3] another compile fix for win32 on arch linux --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0fc502ed..ba2e9b0a 100644 --- 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 = -mdll -Wl,--add-stdcall-alias + LDFLAGS_DLL = -Wl,--add-stdcall-alias LIBS_COMMON = -lws2_32 -luser32 -lgdi32 -lole32 EXE ?= exe A = a From 34dd9340fca9c50b4a431778ce57f28ca4d8b7bf Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 14 Jan 2012 00:10:38 +0100 Subject: [PATCH 3/3] add two missing dlls --- install-dlls.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install-dlls.sh b/install-dlls.sh index f83e3862..59ae421e 100755 --- 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