summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorSimon Howard2009-11-21 16:36:46 +0000
committerSimon Howard2009-11-21 16:36:46 +0000
commitafa0c4c7979c1508605d0e79487f299cd03adda6 (patch)
tree7df1745badf169e4490e3a56a89a28ac37977c14 /pkg
parent095bc1110b3c11fbf2e17bfd51bf78909fe34662 (diff)
parent2c6e7b2f10c32ca0406ca6753e7701d83e6dea8f (diff)
downloadchocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.tar.gz
chocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.tar.bz2
chocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.zip
Merge from trunk.
Subversion-branch: /branches/raven-branch Subversion-revision: 1737
Diffstat (limited to 'pkg')
-rw-r--r--pkg/Makefile.am3
-rw-r--r--pkg/win32/GNUmakefile.am36
-rw-r--r--pkg/win32/README4
-rw-r--r--pkg/wince/GNUmakefile.am (renamed from pkg/wince/Makefile.am)0
4 files changed, 43 insertions, 0 deletions
diff --git a/pkg/Makefile.am b/pkg/Makefile.am
new file mode 100644
index 00000000..66cb9ba0
--- /dev/null
+++ b/pkg/Makefile.am
@@ -0,0 +1,3 @@
+
+DIST_SUBDIRS=wince win32
+
diff --git a/pkg/win32/GNUmakefile.am b/pkg/win32/GNUmakefile.am
new file mode 100644
index 00000000..e9964b22
--- /dev/null
+++ b/pkg/win32/GNUmakefile.am
@@ -0,0 +1,36 @@
+
+TOPLEVEL=../..
+
+EXE_FILES=$(TOPLEVEL)/src/@PROGRAM_PREFIX@doom.exe \
+ $(TOPLEVEL)/src/@PROGRAM_PREFIX@-heretic.exe \
+ $(TOPLEVEL)/src/@PROGRAM_PREFIX@-hexen.exe \
+ $(TOPLEVEL)/src/@PROGRAM_PREFIX@-server.exe \
+ $(TOPLEVEL)/src/@PROGRAM_PREFIX@-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.
+
diff --git a/pkg/wince/Makefile.am b/pkg/wince/GNUmakefile.am
index a203e63c..a203e63c 100644
--- a/pkg/wince/Makefile.am
+++ b/pkg/wince/GNUmakefile.am