yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-25 22:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #576 from pettyalex/macos-relative-linker-path

Browse source 
Enable rpath with Mac OS linker
This commit is contained in:
Yamagi 2020-06-02 08:29:18 +02:00 committed by GitHub
commit 486441eb0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -335,6 +335,7 @@ config:
@echo "WITH_OPENAL = $(WITH_OPENAL)" @echo "WITH_OPENAL = $(WITH_OPENAL)"
@echo "WITH_SYSTEMWIDE = $(WITH_SYSTEMWIDE)" @echo "WITH_SYSTEMWIDE = $(WITH_SYSTEMWIDE)"
@echo "WITH_SYSTEMDIR = $(WITH_SYSTEMDIR)" @echo "WITH_SYSTEMDIR = $(WITH_SYSTEMDIR)"
@echo "WITH_RPATH = $(WITH_RPATH)"
@echo "============================" @echo "============================"
@echo "" @echo ""
@ -426,9 +427,13 @@ release/quake2 : LDFLAGS += -lexecinfo
endif endif
ifeq ($(WITH_RPATH),yes) ifeq ($(WITH_RPATH),yes)
ifeq ($(YQ2_OSTYPE), Darwin)
release/quake2 : LDFLAGS += -Wl,-rpath,'@executable_path/lib'
else
release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib' release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
endif endif
endif endif
endif
# ---------- # ----------