From 6e717690078ca8877631180501d7369d3dfc6468 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 10 Oct 2009 21:46:14 +0000
Subject: Add pkg directory to make dist.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1712
---
 pkg/Makefile.am       | 3 +++
 pkg/wince/Makefile.am | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 pkg/Makefile.am

(limited to 'pkg')

diff --git a/pkg/Makefile.am b/pkg/Makefile.am
new file mode 100644
index 00000000..00ab5d6f
--- /dev/null
+++ b/pkg/Makefile.am
@@ -0,0 +1,3 @@
+
+DIST_SUBDIRS=wince
+
diff --git a/pkg/wince/Makefile.am b/pkg/wince/Makefile.am
index 13b48d2e..e710e679 100644
--- a/pkg/wince/Makefile.am
+++ b/pkg/wince/Makefile.am
@@ -3,6 +3,8 @@ DEPS=$(shell ./wince-cabgen -d $(CONFIG_FILE))
 CONFIG_FILE=wince-cab.cfg
 OUTPUT_FILE=@PACKAGE_TARNAME@-@PACKAGE_VERSION@.cab
 
+EXTRA_DIST=wince-cabgen $(CONFIG_FILE)
+
 noinst_DATA = $(OUTPUT_FILE)
 
 $(OUTPUT_FILE) : $(CONFIG_FILE) $(DEPS)
-- 
cgit v1.2.3


From 86d786342816666d70f9abdb57b46438a079ff5a Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 10 Oct 2009 22:58:25 +0000
Subject: Rename pkg/wince/Makefile to pkg/wince/GNUmakefile (it uses GNU
 extensions).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1714
---
 pkg/wince/GNUmakefile.am | 12 ++++++++++++
 pkg/wince/Makefile.am    | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 pkg/wince/GNUmakefile.am
 delete mode 100644 pkg/wince/Makefile.am

(limited to 'pkg')

diff --git a/pkg/wince/GNUmakefile.am b/pkg/wince/GNUmakefile.am
new file mode 100644
index 00000000..e710e679
--- /dev/null
+++ b/pkg/wince/GNUmakefile.am
@@ -0,0 +1,12 @@
+
+DEPS=$(shell ./wince-cabgen -d $(CONFIG_FILE))
+CONFIG_FILE=wince-cab.cfg
+OUTPUT_FILE=@PACKAGE_TARNAME@-@PACKAGE_VERSION@.cab
+
+EXTRA_DIST=wince-cabgen $(CONFIG_FILE)
+
+noinst_DATA = $(OUTPUT_FILE)
+
+$(OUTPUT_FILE) : $(CONFIG_FILE) $(DEPS)
+	./wince-cabgen $< $@
+
diff --git a/pkg/wince/Makefile.am b/pkg/wince/Makefile.am
deleted file mode 100644
index e710e679..00000000
--- a/pkg/wince/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-
-DEPS=$(shell ./wince-cabgen -d $(CONFIG_FILE))
-CONFIG_FILE=wince-cab.cfg
-OUTPUT_FILE=@PACKAGE_TARNAME@-@PACKAGE_VERSION@.cab
-
-EXTRA_DIST=wince-cabgen $(CONFIG_FILE)
-
-noinst_DATA = $(OUTPUT_FILE)
-
-$(OUTPUT_FILE) : $(CONFIG_FILE) $(DEPS)
-	./wince-cabgen $< $@
-
-- 
cgit v1.2.3


From 2c6e7b2f10c32ca0406ca6753e7701d83e6dea8f Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 21 Nov 2009 03:56:59 +0000
Subject: Add Makefile to build Win32 packages.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1736
---
 pkg/Makefile.am          |  2 +-
 pkg/win32/GNUmakefile.am | 34 ++++++++++++++++++++++++++++++++++
 pkg/win32/README         |  4 ++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 pkg/win32/GNUmakefile.am
 create mode 100644 pkg/win32/README

(limited to 'pkg')

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.
+
-- 
cgit v1.2.3