Lines 1-5
Link Here
|
1 |
--- ./makefile_tiles.unix.orig 2009-06-12 12:32:15.000000000 +0200 |
1 |
--- ./makefile_tiles.unix.orig 2009-10-06 20:44:04.000000000 +0200 |
2 |
+++ ./makefile_tiles.unix 2009-06-19 13:54:52.000000000 +0200 |
2 |
+++ ./makefile_tiles.unix 2009-10-15 18:40:29.000000000 +0200 |
3 |
@@ -4,7 +4,7 @@ |
3 |
@@ -4,7 +4,7 @@ |
4 |
# Modified for Crawl Reference by $Author: dshaligram $ on $Date: 2007-06-24T16:27:58.475101Z $ |
4 |
# Modified for Crawl Reference by $Author: dshaligram $ on $Date: 2007-06-24T16:27:58.475101Z $ |
5 |
# |
5 |
# |
Lines 9-23
Link Here
|
9 |
|
9 |
|
10 |
# this file contains a list of the libraries. |
10 |
# this file contains a list of the libraries. |
11 |
# it will make a variable called OBJECTS that contains all the libraries |
11 |
# it will make a variable called OBJECTS that contains all the libraries |
12 |
@@ -15,7 +15,6 @@ |
12 |
@@ -15,7 +15,9 @@ |
13 |
SDL_CFLAGS := $(shell sdl-config --cflags) |
13 |
SDL_CFLAGS := $(shell sdl-config --cflags) |
14 |
SDL_LDFLAGS := $(shell sdl-config --libs) -lSDLmain |
14 |
SDL_LDFLAGS := $(shell sdl-config --libs) -lSDLmain |
15 |
|
15 |
|
16 |
-CXX = g++ |
16 |
+ifndef FREEBSD |
|
|
17 |
CXX = g++ |
18 |
+endif |
17 |
DELETE = rm -f |
19 |
DELETE = rm -f |
18 |
COPY = cp |
20 |
COPY = cp |
19 |
OS_TYPE = UNIX |
21 |
OS_TYPE = UNIX |
20 |
@@ -25,7 +24,7 @@ |
22 |
@@ -25,7 +27,7 @@ |
21 |
|
23 |
|
22 |
# Change this to y if you want to use Unicode glyphs in the map, and you have |
24 |
# Change this to y if you want to use Unicode glyphs in the map, and you have |
23 |
# libncursesw available. |
25 |
# libncursesw available. |
Lines 26-41
Link Here
|
26 |
|
28 |
|
27 |
ifeq ($(strip $(OSX)),y) |
29 |
ifeq ($(strip $(OSX)),y) |
28 |
PNG_INCLUDE := -I/sw/include |
30 |
PNG_INCLUDE := -I/sw/include |
29 |
@@ -41,7 +40,7 @@ |
31 |
@@ -41,7 +43,7 @@ |
30 |
else |
32 |
else |
31 |
PNG_INCLUDE := |
33 |
PNG_INCLUDE := |
32 |
PNG_LIB := |
34 |
PNG_LIB := |
33 |
-FREETYPE_INCLUDE := -I/usr/include/freetype2 |
35 |
-FREETYPE_INCLUDE := -I/usr/include/freetype2 |
34 |
+FREETYPE_INCLUDE := -I/usr/local/include/freetype2 |
36 |
+FREETYPE_INCLUDE := -I%%LOCALBASE%%/include/freetype2 |
35 |
endif |
37 |
endif |
36 |
|
38 |
|
37 |
# If you have lex and yacc, set DOYACC to y (lowercase y). |
39 |
# If you have lex and yacc, set DOYACC to y (lowercase y). |
38 |
@@ -54,16 +53,16 @@ |
40 |
@@ -54,16 +56,16 @@ |
39 |
MCHMOD_SAVEDIR := 775 |
41 |
MCHMOD_SAVEDIR := 775 |
40 |
|
42 |
|
41 |
# The user:group to install the game as. |
43 |
# The user:group to install the game as. |
Lines 56-80
Link Here
|
56 |
|
58 |
|
57 |
LEX := flex |
59 |
LEX := flex |
58 |
YACC := bison -y |
60 |
YACC := bison -y |
59 |
@@ -105,17 +104,8 @@ |
61 |
@@ -105,10 +107,13 @@ |
60 |
|
62 |
|
61 |
INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES) $(PNG_INCLUDE) $(FREETYPE_INCLUDE) |
63 |
INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES) $(PNG_INCLUDE) $(FREETYPE_INCLUDE) |
62 |
|
64 |
|
63 |
-CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic -Wno-parentheses |
65 |
+ifndef FREEBSD |
64 |
- |
66 |
CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic -Wno-parentheses |
|
|
67 |
+endif |
68 |
|
65 |
CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS |
69 |
CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS |
66 |
|
70 |
|
67 |
-ifneq ($(HURRY),y) |
71 |
+ifndef FREEBSD |
68 |
-ifneq ($(DEBUG_CRAWL),y) |
72 |
ifneq ($(HURRY),y) |
69 |
-CFWARN += -Wuninitialized |
73 |
ifneq ($(DEBUG_CRAWL),y) |
70 |
-CFOTHERS += -O2 |
74 |
CFWARN += -Wuninitialized |
71 |
-endif |
75 |
@@ -116,6 +121,8 @@ |
72 |
-endif |
76 |
endif |
73 |
- |
77 |
endif |
|
|
78 |
|
79 |
+endif |
80 |
+ |
74 |
ifneq ($(strip $(SAVEDIR)),) |
81 |
ifneq ($(strip $(SAVEDIR)),) |
75 |
CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"' |
82 |
CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"' |
76 |
endif |
83 |
endif |
77 |
@@ -124,8 +114,8 @@ |
84 |
@@ -124,8 +131,8 @@ |
78 |
CFOTHERS += '-DDATA_DIR_PATH="$(strip $(DATADIR))"' |
85 |
CFOTHERS += '-DDATA_DIR_PATH="$(strip $(DATADIR))"' |
79 |
endif |
86 |
endif |
80 |
|
87 |
|
Lines 85-91
Link Here
|
85 |
|
92 |
|
86 |
UTIL = util/ |
93 |
UTIL = util/ |
87 |
|
94 |
|
88 |
@@ -167,7 +157,7 @@ |
95 |
@@ -167,7 +174,7 @@ |
89 |
rm -f $(DEPENDENCY_MKF).tmp |
96 |
rm -f $(DEPENDENCY_MKF).tmp |
90 |
@for i in $^; do \ |
97 |
@for i in $^; do \ |
91 |
echo "Updating dependencies for $$i"; \ |
98 |
echo "Updating dependencies for $$i"; \ |
Lines 94-100
Link Here
|
94 |
done |
101 |
done |
95 |
mv -f $(DEPENDENCY_MKF).tmp $(DEPENDENCY_MKF) |
102 |
mv -f $(DEPENDENCY_MKF).tmp $(DEPENDENCY_MKF) |
96 |
|
103 |
|
97 |
@@ -210,7 +200,7 @@ |
104 |
@@ -210,7 +217,7 @@ |
98 |
ORIGTILEFILES = $(TILEFILES:%=$(RLTILES)/%) |
105 |
ORIGTILEFILES = $(TILEFILES:%=$(RLTILES)/%) |
99 |
|
106 |
|
100 |
makerltiles: |
107 |
makerltiles: |
Lines 103-109
Link Here
|
103 |
|
110 |
|
104 |
$(TILEDEFSRCS): makerltiles |
111 |
$(TILEDEFSRCS): makerltiles |
105 |
|
112 |
|
106 |
@@ -222,7 +212,7 @@ |
113 |
@@ -222,7 +229,7 @@ |
107 |
$(COPY) $< $@ |
114 |
$(COPY) $< $@ |
108 |
|
115 |
|
109 |
clean-rltiles: |
116 |
clean-rltiles: |
Lines 112-118
Link Here
|
112 |
|
119 |
|
113 |
########################################################################## |
120 |
########################################################################## |
114 |
|
121 |
|
115 |
@@ -287,21 +277,21 @@ |
122 |
@@ -287,21 +294,21 @@ |
116 |
$(DELETE) $(DEPENDENCY_MKF) |
123 |
$(DELETE) $(DEPENDENCY_MKF) |
117 |
|
124 |
|
118 |
$(GAME): $(GAME_DEPENDS) |
125 |
$(GAME): $(GAME_DEPENDS) |
Lines 138-140
Link Here
|
138 |
|
145 |
|
139 |
# [ds] Note we don't use the standard CFLAGS here; that's intentional, most |
146 |
# [ds] Note we don't use the standard CFLAGS here; that's intentional, most |
140 |
# flex/bison combos I've tried don't produce code that passes the warnings |
147 |
# flex/bison combos I've tried don't produce code that passes the warnings |
|
|
148 |
@@ -314,14 +321,22 @@ |
149 |
|
150 |
$(LUASRC)$(LUALIBA): |
151 |
echo Building Lua... |
152 |
+ifdef FREEBSD |
153 |
+ cd $(LUASRC) && $(MAKE) FREEBSD=yes crawl_unix |
154 |
+else |
155 |
cd $(LUASRC) && $(MAKE) crawl_unix |
156 |
+endif |
157 |
|
158 |
############################################################################# |
159 |
# Build SQLite |
160 |
|
161 |
$(FSQLLIBA): |
162 |
echo Building SQLite |
163 |
+ifdef FREEBSD |
164 |
+ cd $(SQLSRC) && $(MAKE) FREEBSD=yes |
165 |
+else |
166 |
cd $(SQLSRC) && $(MAKE) |
167 |
+endif |
168 |
|
169 |
############################################################################# |
170 |
# Packaging a source tarball for release |