Add stuff needed for NetBSD to build sfrotz. Still messy in sf_ftype.c.
authorDavid Griffith <dave@661.org>
Tue, 23 Jul 2019 10:42:58 +0000 (03:42 -0700)
committerDavid Griffith <dave@661.org>
Tue, 23 Jul 2019 10:42:58 +0000 (03:42 -0700)
Makefile
src/sdl/sf_ftype.c
src/sdl/sf_sig.c

index d766d9daf8e8ebc0939607df6ad01aa53c377045..befc165004f23ab68788664072b6e75a4bf7813c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ ifneq ($(OS),Windows_NT)
        CFLAGS += -D_NETBSD_SOURCE -I/usr/pkg/include 
        LDFLAGS += -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
        CURSES_CFLAGS += -I/usr/pkg/include/ncurses -I/usr/pkg/include/ncursesw 
+       SDL_LDFLAGS += -lexecinfo
     endif
     ifeq ($(UNAME_S),Linux)
        NPROCS = $(shell grep -c ^processor /proc/cpuinfo)
@@ -219,7 +220,7 @@ endif
 SDL_DIR = $(SRCDIR)/sdl
 SDL_LIB = $(SDL_DIR)/frotz_sdl.a
 export SDL_PKGS = libpng libjpeg sdl2 SDL2_mixer freetype2 zlib
-SDL_LDFLAGS = `pkg-config $(SDL_PKGS) --libs` -lm
+SDL_LDFLAGS += `pkg-config $(SDL_PKGS) --libs` -lm
 
 DOS_DIR = $(SRCDIR)/dos
 
index 537c4305b1491ed0cdd26184e4f0b8304275fa4a..d49f43d2df21a2b4e9fac5a9129ca81ff5be7619 100644 (file)
@@ -8,6 +8,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
+#include <freetype2/freetype/freetype.h>
 
 /////////////////////////////////////////////////////////////////
 
index 40ba3e7feafa87851806d71fbea4d3a67cb8859c..51b4eb0ea75fdda41bb58dede9a6c1fcf04dd699 100644 (file)
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <execinfo.h>
 
 #include <SDL.h>