61 lines
1.8 KiB
Plaintext
61 lines
1.8 KiB
Plaintext
$NetBSD: patch-Makefile,v 1.2 2015/01/28 17:11:28 jmcneill Exp $
|
|
|
|
--- Makefile.orig 2014-11-03 15:11:07.000000000 +0000
|
|
+++ Makefile
|
|
@@ -676,9 +676,6 @@ ifeq ($(PLATFORM),netbsd)
|
|
|
|
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
|
|
|
|
- BUILD_CLIENT = 0
|
|
- BUILD_GAME_QVM = 0
|
|
-
|
|
else # ifeq netbsd
|
|
|
|
#############################################################################
|
|
@@ -968,11 +965,11 @@ default: release
|
|
all: debug release
|
|
|
|
debug:
|
|
- @$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \
|
|
+ @$(MAKE) targets B=$(BD) CFLAGS="$(BASE_CFLAGS) $(CFLAGS) $(DEPEND_CFLAGS) \
|
|
$(DEBUG_CFLAGS)" V=$(V)
|
|
|
|
release:
|
|
- @$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \
|
|
+ @$(MAKE) targets B=$(BR) CFLAGS="$(BASE_CFLAGS) $(CFLAGS) $(DEPEND_CFLAGS) \
|
|
$(RELEASE_CFLAGS)" V=$(V)
|
|
|
|
# Create the build directories, check libraries and print out
|
|
@@ -1379,7 +1376,7 @@ Q3OBJ = \
|
|
$(B)/client/sys_main.o
|
|
|
|
|
|
- Q3OBJ += $(if $(or $(findstring arm,$(ARCH)), $(USBDK)), \
|
|
+ Q3OBJ += $(if $(or $(findstring rpi,$(ARCH)), $(USBDK)), \
|
|
$(B)/client/es_gamma.o $(B)/client/sdl_snd.o, \
|
|
$(B)/client/sdl_gamma.o $(B)/client/sdl_snd.o)
|
|
|
|
@@ -1388,7 +1385,7 @@ Q3OBJ = \
|
|
$(B)/client/sdl_input.o)
|
|
|
|
#
|
|
-#ifeq ($(ARCH),arm)
|
|
+#ifeq ($(ARCH),rpi)
|
|
# Q3OBJ += \
|
|
# $(B)/client/es_gamma.o \
|
|
# $(B)/client/es_input.o \
|
|
@@ -1497,11 +1494,11 @@ ifeq ($(USE_MUMBLE),1)
|
|
$(B)/client/libmumblelink.o
|
|
endif
|
|
|
|
- Q3POBJ += $(if $(or $(findstring arm,$(ARCH)), $(USBDK)), \
|
|
+ Q3POBJ += $(if $(or $(findstring rpi,$(ARCH)), $(USBDK)), \
|
|
$(B)/client/es_glimp.o $(B)/client/etc1encode.o, \
|
|
$(B)/client/sdl_glimp.o)
|
|
|
|
-#ifeq ($(ARCH),arm)
|
|
+#ifeq ($(ARCH),rpi)
|
|
# Q3POBJ += \
|
|
# $(B)/client/es_glimp.o \
|
|
# $(B)/client/etc1encode.o
|