blob: 078cab809fbc9a15f259b0f138eaa2d6bd3844af (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
--- sys/unix/Makefile.src.orig Tue Jun 6 23:23:32 2006
+++ sys/unix/Makefile.src Tue Sep 12 18:31:34 2006
@@ -153,22 +153,17 @@
# VULTURESCFLAGS will be passed to the sub-makefile for vultures
OS = $(shell uname -s)
-ifeq ($(OS),FreeBSD)
- SDL_CONFIG = sdl11-config
- SDLMAIN = -lSDLmain-1.1
-else
- SDL_CONFIG = sdl-config
- SDLMAIN = -lSDLmain
-endif
-VULTURESCFLAGS = -Wall -g
-CFLAGS = -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
+SDL_CONFIG = sdl-config
+SDLMAIN = -lSDLmain
+VULTURESCFLAGS = ${CFLAGS}
+CFLAGS += -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
LFLAGS =
# The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LINK line here to get
# the C++ libraries linked in.
-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
-CXX=g++
+CXXFLAGS += $(CFLAGS) -I. -I$(QTDIR)/include
+CXX?=g++
#LINK=g++
# For cross-compiling, eg. with gcc on Linux (see also CC further up):
#CXX=arm-linux-g++
@@ -480,7 +475,7 @@
@rm -f $(MAKEDEFS)
../win/vultures/build_n/vultures.o: objects.o monst.o ../include/date.h ../win/vultures/* ../win/vultures/util/*
- @$(MAKE) -C ../win/vultures/ BUILD=nethack BASECFLAGS="$(VULTURESCFLAGS)"
+ @$(MAKE) -C ../win/vultures/ BUILD=nethack BASECFLAGS="$(VULTURESCFLAGS)" SDL_CONFIG="${SDL_CONFIG}"
# Qt windowport meta-object-compiler output
qt_kde0.moc: ../include/qt_kde0.h
|
