From c1ef714fc72031413f403314fc4dd45448ed8fc4 Mon Sep 17 00:00:00 2001 From: David Griffith Date: Fri, 27 Jul 2018 20:30:38 -0700 Subject: [PATCH] Fixed problem with sfrotz needlessly recompiling. Something about a header file names "defines.h" causes it to never be up-to-date? So I changed it to "defs.h". --- Makefile | 4 ++-- src/common/frotz.h | 2 +- src/curses/ux_frotz.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 03972cd..c219514 100644 --- a/Makefile +++ b/Makefile @@ -113,12 +113,12 @@ SRCDIR = src COMMON_DIR = $(SRCDIR)/common COMMON_LIB = $(COMMON_DIR)/frotz_common.a COMMON_STRINGS = $(COMMON_DIR)/version.c -COMMON_DEFINES = $(COMMON_DIR)/defines.h +COMMON_DEFINES = $(COMMON_DIR)/defs.h HASH = $(COMMON_DIR)/git_hash.h CURSES_DIR = $(SRCDIR)/curses CURSES_LIB = $(CURSES_DIR)/frotz_curses.a -CURSES_DEFINES = $(CURSES_DIR)/defines.h +CURSES_DEFINES = $(CURSES_DIR)/ux_defines.h DUMB_DIR = $(SRCDIR)/dumb DUMB_LIB = $(DUMB_DIR)/frotz_dumb.a diff --git a/src/common/frotz.h b/src/common/frotz.h index fb1eb34..6883e28 100644 --- a/src/common/frotz.h +++ b/src/common/frotz.h @@ -125,7 +125,7 @@ typedef struct { #include "setup.h" -#include "defines.h" +#include "defs.h" #include "missing.h" #include "unused.h" diff --git a/src/curses/ux_frotz.h b/src/curses/ux_frotz.h index 25fe4a7..1e87b3f 100644 --- a/src/curses/ux_frotz.h +++ b/src/curses/ux_frotz.h @@ -10,11 +10,11 @@ #include -#include "defines.h" #include "../common/frotz.h" #include "../blorb/blorb.h" #include "../blorb/blorblow.h" #include "ux_setup.h" +#include "ux_defines.h" #define MASTER_CONFIG "frotz.conf" #define USER_CONFIG ".frotzrc" -- 2.34.1