From 452970d0b25140c6a8e7c809c448717d4c3766b0 Mon Sep 17 00:00:00 2001
From: Mike Swanson <mikeonthecomputer@gmail.com>
Date: Wed, 22 Jan 2020 03:44:26 -0800
Subject: [PATCH 1/2] configure: stop using AC_FUNC_MALLOC/REALLOC (#52)

These are apparently mostly useless and worse, break
cross-compilation.  See:
https://sourceforge.net/p/mingw-w64/mailman/message/36424004/

Really resolves #50
---
 configure.ac | 2 --
 1 file changed, 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index ccbb428f..d6213da0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,8 +54,6 @@ AC_CHECK_TYPES([ptrdiff_t])
 # Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_ERROR_AT_LINE
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
 AC_CHECK_FUNCS([atexit memmove memset mkdir pow putenv strcasecmp strchr strdup strerror strncasecmp strrchr strstr strtol])
 
 AC_ARG_ENABLE([dogs], AS_HELP_STRING([--disable-dogs], [Disable support for helper dogs]))

From 775594c469eec30a5614e5f2e76ea93416f8288a Mon Sep 17 00:00:00 2001
From: Mike Swanson <mikeonthecomputer@gmail.com>
Date: Wed, 22 Jan 2020 03:45:10 -0800
Subject: [PATCH 2/2] pkg: get needed ldflags and copy woof.exe to staging
 (#53)

* pkg: get needed ldflags and copy woof.exe to staging

Repairs actual operation of the win32 packaging script

* Include the pkg subdirectory so it gets included in `make dist`
---
 Makefile.am           | 1 +
 configure.ac          | 1 +
 pkg/Makefile.am       | 3 +--
 pkg/config.make.in    | 3 +--
 pkg/win32/GNUmakefile | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index da1d607d..1af090df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,5 +9,6 @@ SUBDIRS = \
 	configs \
 	docs \
 	examples \
+	pkg \
 	Source \
 	toolsrc
diff --git a/configure.ac b/configure.ac
index d6213da0..fa5cc544 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,7 @@ examples/Makefile
 Source/Makefile
 Source/resource.rc
 toolsrc/Makefile
+pkg/Makefile
 pkg/config.make
 ])
 AC_OUTPUT
diff --git a/pkg/Makefile.am b/pkg/Makefile.am
index aa543028..b2349a8d 100644
--- a/pkg/Makefile.am
+++ b/pkg/Makefile.am
@@ -1,8 +1,7 @@
 
 WIN32_FILES=                                                            \
 win32/GNUmakefile                                                       \
-win32/cp-with-libs                                                      \
-win32/README
+win32/cp-with-libs
 
 EXTRA_DIST=$(WIN32_FILES)
 
diff --git a/pkg/config.make.in b/pkg/config.make.in
index 8ec0fda9..fe515307 100644
--- a/pkg/config.make.in
+++ b/pkg/config.make.in
@@ -6,9 +6,8 @@
 # Tools needed:
 
 CC = @CC@
-OBJDUMP = @OBJDUMP@
 STRIP = @STRIP@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @SDL_LIBS@
 
 # Package name and version number:
 
diff --git a/pkg/win32/GNUmakefile b/pkg/win32/GNUmakefile
index ac5ba257..f8343fba 100644
--- a/pkg/win32/GNUmakefile
+++ b/pkg/win32/GNUmakefile
@@ -3,7 +3,7 @@ include ../config.make
 
 TOPLEVEL=../..
 
-ZIP=$(PACKAGE)$(PACKAGE_VERSION)-win32.zip
+ZIP=$(PACKAGE)-$(PACKAGE_VERSION)-win32.zip
 
 all: $(ZIP)
 
@@ -12,7 +12,7 @@ $(ZIP): staging
 
 staging:
 	mkdir $@
-	LC_ALL=C ./cp-with-libs --ldflags="$(LDFLAGS)" "$(TOPLEVEL)/Source/woof.exe"
+	LC_ALL=C ./cp-with-libs --ldflags="$(LDFLAGS)" "$(TOPLEVEL)/Source/woof.exe" $@
 
 	$(STRIP) $@/*.exe $@/*.dll