yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-09 23:02:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Another round of small Makefile fixes:

Browse source 
* ZIPCFLAGS was never defined, just appended to.
* Make INCLUDE overrideable.
This commit is contained in:
Yamagi 2020-03-13 09:35:01 +01:00
parent 11cb64ede2
commit c904880dc9
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -213,6 +213,9 @@ endif
# ----------
# We don't support encrypted ZIP files.
ZIPCFLAGS := -DNOUNCRYPT
# Just set IOAPI_NO_64 on everything that's not Linux or Windows,
# otherwise minizip will use fopen64(), fseek64() and friends that
# may be unavailable. This is - of course - not really correct, in
@ -230,9 +233,6 @@ ZIPCFLAGS += -DIOAPI_NO_64
endif
endif
# We don't support encrypted ZIP files.
ZIPCFLAGS += -DNOUNCRYPT
# ----------
# Extra CFLAGS for SDL.
@ -242,13 +242,13 @@ SDLCFLAGS := $(shell sdl2-config --cflags)
# Base include path.
ifeq ($(YQ2_OSTYPE),Linux)
INCLUDE := -I/usr/include
INCLUDE ?= -I/usr/include
else ifeq ($(YQ2_OSTYPE),FreeBSD)
INCLUDE := -I/usr/local/include
INCLUDE ?= -I/usr/local/include
else ifeq ($(YQ2_OSTYPE),OpenBSD)
INCLUDE := -I/usr/local/include
INCLUDE ?= -I/usr/local/include
else ifeq ($(YQ2_OSTYPE),Windows)
INCLUDE := -I/usr/include
INCLUDE ?= -I/usr/include
endif
# ----------