mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2025-03-02 23:42:28 +00:00
Merge remote-tracking branch 'yquake2/master'
This commit is contained in:
commit
6dfcbf1429
2 changed files with 11 additions and 5 deletions
9
Makefile
9
Makefile
|
@ -302,6 +302,8 @@ else ifeq ($(YQ2_OSTYPE),OpenBSD)
|
||||||
INCLUDE ?= -I/usr/local/include
|
INCLUDE ?= -I/usr/local/include
|
||||||
else ifeq ($(YQ2_OSTYPE),Windows)
|
else ifeq ($(YQ2_OSTYPE),Windows)
|
||||||
INCLUDE ?= -I/usr/include
|
INCLUDE ?= -I/usr/include
|
||||||
|
else ifeq ($(YQ2_OSTYPE),Darwin)
|
||||||
|
INCLUDE ?= -I/usr/local/include -I/opt/homebrew/include
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ----------
|
# ----------
|
||||||
|
@ -317,6 +319,8 @@ else ifeq ($(YQ2_OSTYPE),OpenBSD)
|
||||||
LDFLAGS ?= -L/usr/local/lib
|
LDFLAGS ?= -L/usr/local/lib
|
||||||
else ifeq ($(YQ2_OSTYPE),Windows)
|
else ifeq ($(YQ2_OSTYPE),Windows)
|
||||||
LDFLAGS ?= -L/usr/lib
|
LDFLAGS ?= -L/usr/lib
|
||||||
|
else ifeq ($(YQ2_OSTYPE),Darwin)
|
||||||
|
LDFLAGS ?= -L/usr/local/lib -L/opt/homebrew/lib
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Link address sanitizer if requested.
|
# Link address sanitizer if requested.
|
||||||
|
@ -506,8 +510,9 @@ ifeq ($(WITH_OPENAL),yes)
|
||||||
ifeq ($(YQ2_OSTYPE), OpenBSD)
|
ifeq ($(YQ2_OSTYPE), OpenBSD)
|
||||||
release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so"'
|
release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so"'
|
||||||
else ifeq ($(YQ2_OSTYPE), Darwin)
|
else ifeq ($(YQ2_OSTYPE), Darwin)
|
||||||
release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.dylib"' -I/usr/local/opt/openal-soft/include
|
OPENAL_PATH ?= $(shell brew --prefix openal-soft)
|
||||||
release/quake2 : LDFLAGS += -L/usr/local/opt/openal-soft/lib -rpath /usr/local/opt/openal-soft/lib
|
release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.dylib"' -I$(OPENAL_PATH)/include
|
||||||
|
release/quake2 : LDFLAGS += -L$(OPENAL_PATH)/lib -rpath $(OPENAL_PATH)/lib
|
||||||
else
|
else
|
||||||
release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so.1"'
|
release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so.1"'
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -73,6 +73,7 @@ SET(SDL2_SEARCH_PATHS
|
||||||
/usr/local
|
/usr/local
|
||||||
/usr
|
/usr
|
||||||
/sw # Fink
|
/sw # Fink
|
||||||
|
/opt/homebrew # Homebrew
|
||||||
/opt/local # DarwinPorts
|
/opt/local # DarwinPorts
|
||||||
/opt/csw # Blastwave
|
/opt/csw # Blastwave
|
||||||
/opt
|
/opt
|
||||||
|
|
Loading…
Reference in a new issue