7 files changed, 119 insertions, 34 deletions
diff --git a/pkg/win32/GNUmakefile.am b/pkg/win32/GNUmakefile.am
index edd57b6e..e9964b22 100644
--- a/pkg/win32/GNUmakefile.am
+++ b/pkg/win32/GNUmakefile.am
@@ -1,9 +1,11 @@
 
 TOPLEVEL=../..
 
-EXE_FILES=$(TOPLEVEL)/src/@PACKAGE_TARNAME@.exe        \
-          $(TOPLEVEL)/src/chocolate-server.exe         \
-          $(TOPLEVEL)/setup/chocolate-setup.exe
+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                \
diff --git a/pkg/wince/GNUmakefile.am b/pkg/wince/GNUmakefile.am
index e710e679..a203e63c 100644
--- a/pkg/wince/GNUmakefile.am
+++ b/pkg/wince/GNUmakefile.am
@@ -1,12 +1,30 @@
 
-DEPS=$(shell ./wince-cabgen -d $(CONFIG_FILE))
-CONFIG_FILE=wince-cab.cfg
-OUTPUT_FILE=@PACKAGE_TARNAME@-@PACKAGE_VERSION@.cab
+# Doom:
 
-EXTRA_DIST=wince-cabgen $(CONFIG_FILE)
+DOOM_CAB=chocolate-doom-@PACKAGE_VERSION@.cab
+DOOM_CFG=doom-cab.cfg
+DOOM_DEPS=$(shell ./wince-cabgen -d $(DOOM_CFG))
 
-noinst_DATA = $(OUTPUT_FILE)
+$(DOOM_CAB) : $(DOOM_CFG) $(DOOM_DEPS)
+	./wince-cabgen $< $@
+
+# Heretic:
+
+HERETIC_CAB=chocolate-heretic-@PACKAGE_VERSION@.cab
+HERETIC_CFG=heretic-cab.cfg
+HERETIC_DEPS=$(shell ./wince-cabgen -d $(HERETIC_CFG))
+
+$(HERETIC_CAB) : $(HERETIC_CFG) $(HERETIC_DEPS)
+	./wince-cabgen $< $@
+
+# Hexen:
 
-$(OUTPUT_FILE) : $(CONFIG_FILE) $(DEPS)
+HEXEN_CAB=chocolate-hexen-@PACKAGE_VERSION@.cab
+HEXEN_CFG=hexen-cab.cfg
+HEXEN_DEPS=$(shell ./wince-cabgen -d $(HEXEN_CFG))
+
+$(HEXEN_CAB) : $(HEXEN_CFG) $(HEXEN_DEPS)
 	./wince-cabgen $< $@
 
+noinst_DATA = $(DOOM_CAB) $(HERETIC_CAB) $(HEXEN_CAB)
+
diff --git a/pkg/wince/common.py b/pkg/wince/common.py
new file mode 100644
index 00000000..e142c2b7
--- /dev/null
+++ b/pkg/wince/common.py
@@ -0,0 +1,9 @@
+
+# SDL library files that need to be installed:
+
+LIBRARIES = [ "SDL.dll", "SDL_mixer.dll", "libSDL_net-1-2-0.dll" ]
+
+def add_libraries(dir, files):
+    for lib in LIBRARIES:
+        files[dir + lib] = lib
+
diff --git a/pkg/wince/doom-cab.cfg b/pkg/wince/doom-cab.cfg
new file mode 100644
index 00000000..2ffba5a3
--- /dev/null
+++ b/pkg/wince/doom-cab.cfg
@@ -0,0 +1,27 @@
+
+from common import *
+
+app_name = "Chocolate Doom"
+provider = "Simon Howard"
+arch = "strongarm"
+
+# Install files:
+
+d = "$(PROGRAMS_GAMES)/Chocolate Doom/"
+s = "$(START_GAMES)/"
+src = "../../src/"
+
+files = {
+    d+"chocolate-doom.exe":        src+"chocolate-doom.exe",
+    d+"chocolate-doom-setup.exe":  src+"chocolate-setup.exe",
+}
+
+add_libraries(d, files)
+
+# Start menu links:
+
+links = {
+    s+"Chocolate Doom.lnk":       d+"chocolate-doom.exe",
+    s+"Chocolate Doom Setup.lnk": d+"chocolate-doom-setup.exe"
+}
+
diff --git a/pkg/wince/heretic-cab.cfg b/pkg/wince/heretic-cab.cfg
new file mode 100644
index 00000000..ead2081f
--- /dev/null
+++ b/pkg/wince/heretic-cab.cfg
@@ -0,0 +1,27 @@
+
+from common import *
+
+app_name = "Chocolate Heretic"
+provider = "Simon Howard"
+arch = "strongarm"
+
+# Install files:
+
+d = "$(PROGRAMS_GAMES)/Chocolate Heretic/"
+s = "$(START_GAMES)/"
+src = "../../src/"
+
+files = {
+    d+"chocolate-heretic.exe":       src+"chocolate-heretic.exe",
+    d+"chocolate-heretic-setup.exe": src+"chocolate-setup.exe",
+}
+
+add_libraries(d, files)
+
+# Start menu links:
+
+links = {
+    s+"Chocolate Heretic.lnk":       d+"chocolate-heretic.exe",
+    s+"Chocolate Heretic Setup.lnk": d+"chocolate-heretic-setup.exe"
+}
+
diff --git a/pkg/wince/hexen-cab.cfg b/pkg/wince/hexen-cab.cfg
new file mode 100644
index 00000000..9d88f01d
--- /dev/null
+++ b/pkg/wince/hexen-cab.cfg
@@ -0,0 +1,27 @@
+
+from common import *
+
+app_name = "Chocolate Hexen"
+provider = "Simon Howard"
+arch = "strongarm"
+
+# Install files:
+
+d = "$(PROGRAMS_GAMES)/Chocolate Hexen/"
+s = "$(START_GAMES)/"
+src = "../../src/"
+
+files = {
+    d+"chocolate-hexen.exe":       src+"chocolate-hexen.exe",
+    d+"chocolate-hexen-setup.exe": src+"chocolate-setup.exe",
+}
+
+add_libraries(d, files)
+
+# Start menu links:
+
+links = {
+    s+"Chocolate Hexen.lnk":       d+"chocolate-hexen.exe",
+    s+"Chocolate Hexen Setup.lnk": d+"chocolate-hexen-setup.exe"
+}
+
diff --git a/pkg/wince/wince-cab.cfg b/pkg/wince/wince-cab.cfg
deleted file mode 100644
index 5f37c5ab..00000000
--- a/pkg/wince/wince-cab.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-
-app_name = "Chocolate Doom"
-provider = "Simon Howard"
-arch = "strongarm"
-
-# Install files:
-
-d = "$(PROGRAMS_GAMES)/Chocolate Doom/"
-s = "$(START_GAMES)/"
-
-files = {
-    d+"chocolate-doom.exe":    "../../src/chocolate-doom.exe",
-    d+"chocolate-setup.exe":   "../../setup/chocolate-setup.exe",
-    d+"SDL.dll":               "SDL.dll",
-    d+"SDL_mixer.dll":         "SDL_mixer.dll",
-    d+"libSDL_net-1-2-0.dll":  "libSDL_net-1-2-0.dll",
-}
-
-# Start menu links:
-
-links = {
-    s+"Chocolate Doom.lnk":  d+"chocolate-doom.exe",
-    s+"Chocolate Doom Setup.lnk": d+"chocolate-setup.exe"
-}
-