commit 2c6e7b2f10c32ca0406ca6753e7701d83e6dea8f
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Nov 21 03:56:59 2009 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sat Nov 21 03:56:59 2009 +0000
Add Makefile to build Win32 packages.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1736
---
configure.in | 2 ++
pkg/Makefile.am | 2 +-
pkg/win32/GNUmakefile.am | 34 ++++++++++++++++++++++++++++++++++
pkg/win32/README | 4 ++++
4 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/configure.in b/configure.in
index f4a3f507..60610ea1 100644
--- a/configure.in
+++ b/configure.in
@@ -74,6 +74,7 @@ AC_SDL_MAIN_WORKAROUND([
])
AC_CHECK_TOOL(WINDRES, windres, )
+AC_CHECK_TOOL(STRIP, strip, )
# Windows CE build?
@@ -123,6 +124,7 @@ src/Makefile
pcsound/Makefile
pkg/Makefile
pkg/wince/GNUmakefile
+pkg/win32/GNUmakefile
src/resource.rc
src/doom-screensaver.desktop
setup/setup-res.rc
diff --git a/pkg/Makefile.am b/pkg/Makefile.am
index 00ab5d6f..66cb9ba0 100644
--- a/pkg/Makefile.am
+++ b/pkg/Makefile.am
@@ -1,3 +1,3 @@
-DIST_SUBDIRS=wince
+DIST_SUBDIRS=wince win32
diff --git a/pkg/win32/GNUmakefile.am b/pkg/win32/GNUmakefile.am
new file mode 100644
index 00000000..edd57b6e
--- /dev/null
+++ b/pkg/win32/GNUmakefile.am
@@ -0,0 +1,34 @@
+
+TOPLEVEL=../..
+
+EXE_FILES=$(TOPLEVEL)/src/@PACKAGE_TARNAME@.exe \
+ $(TOPLEVEL)/src/chocolate-server.exe \
+ $(TOPLEVEL)/setup/chocolate-setup.exe
+
+DLL_FILES=$(TOPLEVEL)/src/SDL.dll \
+ $(TOPLEVEL)/src/SDL_mixer.dll \
+ $(TOPLEVEL)/src/SDL_net.dll
+
+DOC_FILES=README \
+ COPYING \
+ ChangeLog \
+ NEWS \
+ BUGS \
+ CMDLINE \
+ TODO
+
+noinst_DATA=@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win32.zip
+
+@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win32.zip : staging
+ zip -j -r $@ staging/
+
+staging: $(EXE_FILES) $(DLL_FILES) $(patsubst %,../../%,$(DOC_FILES))
+ rm -rf staging
+ mkdir staging
+ cp $(EXE_FILES) $(DLL_FILES) staging/
+ $(STRIP) staging/*.exe
+ for f in $(DOC_FILES); do \
+ cp $(TOPLEVEL)/$$f staging/$$f.txt; \
+ unix2dos staging/$$f.txt; \
+ done
+
diff --git a/pkg/win32/README b/pkg/win32/README
new file mode 100644
index 00000000..1f43f52c
--- /dev/null
+++ b/pkg/win32/README
@@ -0,0 +1,4 @@
+
+Makefile to build Windows packages. Requires zip and unix2dos cygwin
+packages to be installed.
+