27373f56b4
Thanks to @emilazy adding support for pkgconfig for SQLite upstream, we can drop that part of the patch. The rest is still needed.
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
|
|
--- a/crawl-ref/source/Makefile
|
|
+++ b/crawl-ref/source/Makefile
|
|
@@ -248,9 +248,9 @@ ifeq ($(uname_S),Darwin)
|
|
STRIP := strip -x
|
|
NEED_APPKIT = YesPlease
|
|
LIBNCURSES_IS_UNICODE = Yes
|
|
- NO_PKGCONFIG = Yes
|
|
- BUILD_SQLITE = YesPlease
|
|
- BUILD_ZLIB = YesPlease
|
|
+ #NO_PKGCONFIG = Yes
|
|
+ #BUILD_SQLITE = YesPlease
|
|
+ #BUILD_ZLIB = YesPlease
|
|
ifdef TILES
|
|
EXTRA_LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL -framework AudioToolbox -framework CoreVideo contrib/install/$(ARCH)/lib/libSDL2main.a
|
|
BUILD_FREETYPE = YesPlease
|
|
diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
|
|
--- a/crawl-ref/source/util/find_font
|
|
+++ b/crawl-ref/source/util/find_font
|
|
@@ -1,6 +1,6 @@
|
|
#! /bin/sh
|
|
|
|
-FONTDIRS="/usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts"
|
|
+FONTDIRS="${fontsPath}/share/fonts"
|
|
|
|
name=$1
|
|
[ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; }
|
|
@@ -11,6 +11,6 @@
|
|
for dir in $FONTDIRS; do
|
|
[ -d "$dir" ] && echo "$dir"
|
|
done
|
|
- } | xargs -I% find % \( -type f -o -type l \) -iname "$name" -print \
|
|
+ } | xargs -I% find -L % \( -type f -o -type l \) -iname "$name" -print \
|
|
| head -n1
|
|
} 2>/dev/null
|
|
diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc
|
|
--- a/crawl-ref/source/windowmanager-sdl.cc
|
|
+++ b/crawl-ref/source/windowmanager-sdl.cc
|
|
@@ -20,7 +20,7 @@
|
|
# else
|
|
# include <SDL2/SDL.h>
|
|
# endif
|
|
-# include <SDL_image.h>
|
|
+# include <SDL2/SDL_image.h>
|
|
# if defined(USE_SOUND) && !defined(WINMM_PLAY_SOUNDS)
|
|
# include <SDL2/SDL_mixer.h>
|
|
# endif
|