diff options
| author | Simon Howard | 2010-02-06 03:14:20 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-02-06 03:14:20 +0000 |
| commit | d9520b6415f8e373cf759f316094b986e57f0f5a (patch) | |
| tree | d256f7d4f1941ec33ae3c956449c70349de7297d /pkg/win32 | |
| parent | 57011e785808847273461aaf6d8ed1df76ff1db9 (diff) | |
| parent | 52f81b4ef175358d1e1f7f9eecab2a1edb7f4b65 (diff) | |
| download | chocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.tar.gz chocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.tar.bz2 chocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.zip | |
Merge from trunk.
Subversion-branch: /branches/strife-branch
Subversion-revision: 1849
Diffstat (limited to 'pkg/win32')
| -rw-r--r-- | pkg/win32/GNUmakefile | 34 | ||||
| -rw-r--r-- | pkg/win32/GNUmakefile.am | 37 |
2 files changed, 34 insertions, 37 deletions
diff --git a/pkg/win32/GNUmakefile b/pkg/win32/GNUmakefile new file mode 100644 index 00000000..147e2890 --- /dev/null +++ b/pkg/win32/GNUmakefile @@ -0,0 +1,34 @@ + +include ../config.make + +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 + +ZIP=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-win32.zip + +$(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 + +clean: + rm -f $(ZIP) + rm -rf staging + diff --git a/pkg/win32/GNUmakefile.am b/pkg/win32/GNUmakefile.am deleted file mode 100644 index 47d5ac63..00000000 --- a/pkg/win32/GNUmakefile.am +++ /dev/null @@ -1,37 +0,0 @@ - -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 \ - HH-TODO \ - 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 - |