From df17e75a1ff8e1fa0779fb7573b5455edf157e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Sat, 21 Apr 2012 04:31:08 +0200 Subject: [PATCH] Rework patch for mingw64. --- mingw32-pdcurses-3.4-build.patch | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/mingw32-pdcurses-3.4-build.patch b/mingw32-pdcurses-3.4-build.patch index d111632..dc34fe0 100644 --- a/mingw32-pdcurses-3.4-build.patch +++ b/mingw32-pdcurses-3.4-build.patch @@ -1,6 +1,15 @@ ---- PDCurses-3.4/win32/mingwin32.mak.orig 2008-09-25 15:30:14.000000000 +0100 -+++ PDCurses-3.4/win32/mingwin32.mak 2008-09-25 15:43:50.000000000 +0100 -@@ -30,8 +30,8 @@ +diff -Naur PDCurses-3.4.orig/win32/mingwin32.mak PDCurses-3.4/win32/mingwin32.mak +--- PDCurses-3.4.orig/win32/mingwin32.mak 2008-07-21 14:31:36.000000000 +0200 ++++ PDCurses-3.4/win32/mingwin32.mak 2012-04-20 15:28:55.071506378 +0200 +@@ -19,6 +19,7 @@ + PDCURSES_WIN_H = $(osdir)/pdcwin.h + + CC = gcc ++STRIP = strip + + ifeq ($(DEBUG),Y) + CFLAGS = -g -Wall -DPDCDEBUG +@@ -30,8 +31,8 @@ CFLAGS += -I$(PDCURSES_SRCDIR) @@ -11,16 +20,16 @@ DEFDEPS = $(BASEDEF) -@@ -50,7 +50,7 @@ +@@ -50,7 +51,7 @@ ifeq ($(DLL),Y) CFLAGS += -DPDC_DLL_BUILD - LIBEXE = gcc $(DEFFILE) -+ LIBEXE = i686-w64-mingw32-gcc $(DEFFILE) ++ LIBEXE = $(CC) $(DEFFILE) LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o LIBCURSES = pdcurses.dll LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE) -@@ -70,24 +70,24 @@ +@@ -70,24 +71,24 @@ libs: $(LIBCURSES) clean: @@ -33,7 +42,7 @@ demos: $(DEMOS) - strip *.exe -+ i686-w64-mingw32-strip *.exe ++ $(STRIP) *.exe $(DEFFILE): $(DEFDEPS) echo LIBRARY pdcurses > $@