diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/Makefile.am | 5 | ||||
| -rw-r--r-- | pkg/config.make.in | 1 | ||||
| -rw-r--r-- | pkg/osx/GNUmakefile | 12 | ||||
| -rw-r--r-- | pkg/win32/GNUmakefile | 8 | ||||
| -rw-r--r-- | pkg/wince/GNUmakefile | 34 | ||||
| -rw-r--r-- | pkg/wince/common.py | 9 | ||||
| -rw-r--r-- | pkg/wince/doom-cab.cfg | 27 | ||||
| -rw-r--r-- | pkg/wince/heretic-cab.cfg | 27 | ||||
| -rw-r--r-- | pkg/wince/hexen-cab.cfg | 27 | ||||
| -rw-r--r-- | pkg/wince/wince-cab.cfg | 25 |
10 files changed, 135 insertions, 40 deletions
diff --git a/pkg/Makefile.am b/pkg/Makefile.am index a22e4018..438a870a 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am @@ -20,7 +20,10 @@ osx/LauncherManager.m osx/LauncherManager.h WINCE_FILES= \ wince/GNUmakefile \ -wince/wince-cab.cfg \ +wince/common.py \ +wince/doom-cab.cfg \ +wince/heretic-cab.cfg \ +wince/hexen-cab.cfg \ wince/wince-cabgen WIN32_FILES= \ diff --git a/pkg/config.make.in b/pkg/config.make.in index a2bde418..27e44bd8 100644 --- a/pkg/config.make.in +++ b/pkg/config.make.in @@ -10,6 +10,7 @@ STRIP = @STRIP@ # Package name and version number: +PROGRAM_PREFIX = @PROGRAM_PREFIX@ PACKAGE = @PACKAGE@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index baaec048..aa31daf4 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -62,10 +62,14 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) cp launcher "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/launcher" - ./cp-with-libs $(TOPLEVEL)/src/$(PACKAGE_TARNAME) "$(APP_BIN_DIR)" - $(STRIP) "$(APP_BIN_DIR)/$(PACKAGE_TARNAME)" - ./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)" - $(STRIP) "$(APP_BIN_DIR)/chocolate-setup" + ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)doom" + ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)heretic "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)heretic" + ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)hexen "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)hexen" + ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup" find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true diff --git a/pkg/win32/GNUmakefile b/pkg/win32/GNUmakefile index 31968795..bfe4f7ef 100644 --- a/pkg/win32/GNUmakefile +++ b/pkg/win32/GNUmakefile @@ -3,9 +3,11 @@ include ../config.make 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 b/pkg/wince/GNUmakefile index b6acc3b8..3b8171aa 100644 --- a/pkg/wince/GNUmakefile +++ b/pkg/wince/GNUmakefile @@ -1,15 +1,35 @@ include ../config.make -DEPS=$(shell ./wince-cabgen -d $(CONFIG_FILE)) -EXECUTABLES=$(filter %.exe, $(DEPS)) -CONFIG_FILE=wince-cab.cfg -OUTPUT_FILE=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).cab +# Doom: -$(OUTPUT_FILE) : $(CONFIG_FILE) $(DEPS) - $(STRIP) $(EXECUTABLES) +DOOM_CAB=$(PROGRAM_PREFIX)doom-$(PACKAGE_VERSION).cab +DOOM_CFG=doom-cab.cfg +DOOM_DEPS=$(shell ./wince-cabgen -d $(DOOM_CFG)) + +# Heretic: + +HERETIC_CAB=$(PROGRAM_PREFIX)heretic-$(PACKAGE_VERSION).cab +HERETIC_CFG=heretic-cab.cfg +HERETIC_DEPS=$(shell ./wince-cabgen -d $(HERETIC_CFG)) + +# Hexen: + +HEXEN_CAB=$(PROGRAM_PREFIX)hexen-$(PACKAGE_VERSION).cab +HEXEN_CFG=hexen-cab.cfg +HEXEN_DEPS=$(shell ./wince-cabgen -d $(HEXEN_CFG)) + +all: $(DOOM_CAB) $(HERETIC_CAB) $(HEXEN_CAB) + +$(DOOM_CAB) : $(DOOM_CFG) $(DOOM_DEPS) + ./wince-cabgen $< $@ + +$(HERETIC_CAB) : $(HERETIC_CFG) $(HERETIC_DEPS) + ./wince-cabgen $< $@ + +$(HEXEN_CAB) : $(HEXEN_CFG) $(HEXEN_DEPS) ./wince-cabgen $< $@ clean: - rm -f $(OUTPUT_FILE) + rm -f $(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" -} - |