102 lines
3.3 KiB
Text
102 lines
3.3 KiB
Text
--- ./Makefile.orig 2014-08-28 05:28:56.000000000 +0200
|
|
+++ ./Makefile 2014-08-29 18:32:12.040229158 +0200
|
|
@@ -69,7 +69,7 @@
|
|
# ask for a package with convenience libraries instead -- we'll try to provide
|
|
# them somewhere in the near future.
|
|
|
|
-GAME = crawl
|
|
+GAME = stonesoup
|
|
|
|
# Disable GNU Make implicit rules and variables. Leaving them enabled will slow
|
|
# down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have
|
|
@@ -101,7 +101,7 @@
|
|
#
|
|
|
|
|
|
-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
|
|
+CFOTHERS := $(CFLAGS)
|
|
CFWARN := -Wall -Wformat-security
|
|
CFWARN_L := -Wundef
|
|
|
|
@@ -118,8 +118,6 @@
|
|
#
|
|
AR = ar
|
|
RANLIB = ranlib
|
|
-CC = $(GCC)
|
|
-CXX = $(GXX)
|
|
RM = rm -f
|
|
COPY = cp
|
|
COPY_R = cp -r
|
|
@@ -535,9 +533,9 @@
|
|
ifneq (,$(shell $(GXX) --version|grep 'g++.*4\.2\.'))
|
|
# OS X uses a buggy ancient version of gcc without fixes from even
|
|
# subsequent point releases of 4.2.
|
|
- CFOPTIMIZE := -O0
|
|
+ CFOPTIMIZE :=
|
|
else
|
|
- CFOPTIMIZE := -O2
|
|
+ CFOPTIMIZE :=
|
|
endif
|
|
endif
|
|
|
|
@@ -606,13 +604,13 @@
|
|
LUA_PACKAGE = lua-5.1
|
|
endif
|
|
else
|
|
- LUA_PACKAGE = lua5.1
|
|
+ LUA_PACKAGE = lua-5.1
|
|
endif
|
|
endif
|
|
endif
|
|
ifndef BUILD_LUA
|
|
ifndef LUA_PACKAGE
|
|
- LUA_PACKAGE = lua5.1
|
|
+ LUA_PACKAGE = lua-5.1
|
|
endif
|
|
INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I | sed -e 's/-I/-isystem /')
|
|
CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
|
|
@@ -625,7 +623,7 @@
|
|
|
|
ifndef BUILD_SQLITE
|
|
ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
|
|
- # INCLUDES_L += -isystem $(SQLITE_INCLUDE_DIR)
|
|
+ INCLUDES_L += -isystem $(SQLITE_INCLUDE_DIR)
|
|
LIBS += $(SQLITE_LIB)
|
|
ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
|
|
DEFINES_L += -DANCIENT_SQLITE
|
|
@@ -777,7 +775,7 @@
|
|
DEFINES += -DWIZARD
|
|
endif
|
|
ifdef NO_OPTIMIZE
|
|
-CFOPTIMIZE := -O0
|
|
+CFOPTIMIZE :=
|
|
endif
|
|
|
|
ifdef PCH
|
|
@@ -901,7 +899,7 @@
|
|
INSTALL_FONTS += $(PROPORTIONAL_FONT)
|
|
endif
|
|
else
|
|
- SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
|
|
+ SYS_PROPORTIONAL_FONT = $(shell dir=%%LOCALBASE%%/lib/X11/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
|
|
ifeq (,$(SYS_PROPORTIONAL_FONT))
|
|
SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
|
|
endif
|
|
@@ -924,7 +922,7 @@
|
|
INSTALL_FONTS += $(MONOSPACED_FONT)
|
|
endif
|
|
else
|
|
- SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
|
|
+ SYS_MONOSPACED_FONT = $(shell dir=%%LOCALBASE%%/lib/X11/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
|
|
ifeq (,$(SYS_MONOSPACED_FONT))
|
|
SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
|
|
endif
|
|
@@ -1127,7 +1125,7 @@
|
|
|
|
LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
|
|
SRC_PKG_BASE := stone_soup
|
|
-SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
|
|
+SRC_VERSION := $(shell cat util/release_ver)
|
|
MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|sed -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
|
|
|
|
export SRC_VERSION
|