commit bfef712cc95bbece6112c05a699b43782349a9c3
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Thu Aug 22 22:46:59 2024 -0400
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Thu Aug 22 22:50:04 2024 -0400
osx: Revert "Use dylibbundler"
This should be unnecessary now after commit c882ffef02.
This reverts commit 28472387c230df24eb7fa461d3dd9cf9409e20e0.
---
.github/workflows/main.yml | 1 -
pkg/osx/GNUmakefile | 25 +++++--------------------
2 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b421a572..3f809fd0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -90,7 +90,6 @@ jobs:
run: |
brew install \
automake \
- dylibbundler \
sdl2 \
sdl2_mixer \
sdl2_net \
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile
index 94e20830..55d7ac81 100644
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -18,12 +18,6 @@ DMG=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-$(POSTFIX).dmg
TOPLEVEL=../..
TOPLEVEL_DOCS=$(patsubst %,../../%,$(DOC_FILES))
-ifeq (, $(shell which dylibbundler))
- CP=./cp-with-libs
-else
- CP=cp
-endif
-
# DMG file containing package:
$(DMG) : tmp.dmg
@@ -75,26 +69,17 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) app.icns wadfile.icns
cp launcher "$(APP_BIN_DIR)"
$(STRIP) "$(APP_BIN_DIR)/launcher"
- $(CP) $(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom "$(APP_BIN_DIR)"
+ ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom "$(APP_BIN_DIR)"
$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)doom"
- $(CP) $(TOPLEVEL)/src/$(PROGRAM_PREFIX)heretic "$(APP_BIN_DIR)"
+ ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)heretic "$(APP_BIN_DIR)"
$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)heretic"
- $(CP) $(TOPLEVEL)/src/$(PROGRAM_PREFIX)hexen "$(APP_BIN_DIR)"
+ ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)hexen "$(APP_BIN_DIR)"
$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)hexen"
- $(CP) $(TOPLEVEL)/src/$(PROGRAM_PREFIX)strife "$(APP_BIN_DIR)"
+ ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)strife "$(APP_BIN_DIR)"
$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)strife"
- $(CP) $(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup "$(APP_BIN_DIR)"
+ ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup "$(APP_BIN_DIR)"
$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup"
- -dylibbundler --bundle-deps --overwrite-files \
- --install-path "@executable_path/" \
- --dest-dir "$(APP_BIN_DIR)" \
- --fix-file "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)doom" \
- --fix-file "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)heretic" \
- --fix-file "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)hexen" \
- --fix-file "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)strife" \
- --fix-file "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup"
-
$(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__ \
-DDOOM -DHERETIC -DHEXEN -DSTRIFE \
< $(TOPLEVEL)/man/INSTALL.template \