From 1891acead564eef9bbf7a76e9e9c4f710a7057ce Mon Sep 17 00:00:00 2001 From: Philip Chimento Date: Wed, 9 Sep 2009 22:11:55 +0000 Subject: [PATCH 1/1] Edited includes to finish fixing #17 git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@111 ddfedd41-794f-dd11-ae45-00112f111e67 --- interpreters/frotz/Makefile.am | 2 +- interpreters/frotz/fastmem.c | 6 +++--- interpreters/frotz/files.c | 2 +- interpreters/frotz/glkfrotz.h | 2 +- interpreters/frotz/main.c | 4 ++-- interpreters/frotz/quetzal.c | 2 +- interpreters/nitfol/Makefile.am | 3 ++- interpreters/nitfol/blorb.c | 2 +- interpreters/nitfol/main.c | 2 +- interpreters/nitfol/nitfol.h | 4 ++-- interpreters/nitfol/nitfol.info | 33 ++++++++++++++++----------------- interpreters/nitfol/no_blorb.c | 2 +- interpreters/nitfol/opt2glkc.pl | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/interpreters/frotz/Makefile.am b/interpreters/frotz/Makefile.am index ce11445..82f9c28 100644 --- a/interpreters/frotz/Makefile.am +++ b/interpreters/frotz/Makefile.am @@ -4,7 +4,7 @@ pkglib_LTLIBRARIES = frotz.la frotz_la_SOURCES = buffer.c err.c fastmem.c files.c input.c main.c math.c \ object.c process.c quetzal.c random.c redirect.c sound.c stream.c table.c \ text.c variable.c glkscreen.c glkmisc.c frotz.h glkfrotz.h glkio.h setup.h -frotz_la_CPPFLAGS = -I$(top_srcdir) +frotz_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara frotz_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) frotzdocdir = $(datadir)/doc/$(PACKAGE)/frotz diff --git a/interpreters/frotz/fastmem.c b/interpreters/frotz/fastmem.c index fa4394b..113c50c 100644 --- a/interpreters/frotz/fastmem.c +++ b/interpreters/frotz/fastmem.c @@ -28,10 +28,10 @@ #include "frotz.h" -#include +#include "glk.h" #include "glkio.h" -#include -#include +#include "glkstart.h" +#include "gi_blorb.h" extern void seed_random (int); extern void restart_screen (void); diff --git a/interpreters/frotz/files.c b/interpreters/frotz/files.c index fd22631..6ed8c33 100644 --- a/interpreters/frotz/files.c +++ b/interpreters/frotz/files.c @@ -19,7 +19,7 @@ */ #include "frotz.h" -#include +#include "glk.h" #include "glkio.h" extern void set_more_prompts (bool); diff --git a/interpreters/frotz/glkfrotz.h b/interpreters/frotz/glkfrotz.h index 471953e..0f8ff4b 100644 --- a/interpreters/frotz/glkfrotz.h +++ b/interpreters/frotz/glkfrotz.h @@ -12,7 +12,7 @@ #include #include -#include +#include "glk.h" extern int curr_status_ht; extern int mach_status_ht; diff --git a/interpreters/frotz/main.c b/interpreters/frotz/main.c index 6ac7aa0..a403c13 100644 --- a/interpreters/frotz/main.c +++ b/interpreters/frotz/main.c @@ -163,8 +163,8 @@ void z_piracy (void) * */ -#include -#include +#include "glk.h" +#include "glkstart.h" static int myargc; static char **myargv; diff --git a/interpreters/frotz/quetzal.c b/interpreters/frotz/quetzal.c index afc2e0e..e41a57b 100644 --- a/interpreters/frotz/quetzal.c +++ b/interpreters/frotz/quetzal.c @@ -19,7 +19,7 @@ */ #include "frotz.h" -#include +#include "glk.h" #include "glkio.h" #define get_c fgetc diff --git a/interpreters/nitfol/Makefile.am b/interpreters/nitfol/Makefile.am index 2a27a0c..23b9398 100644 --- a/interpreters/nitfol/Makefile.am +++ b/interpreters/nitfol/Makefile.am @@ -23,7 +23,8 @@ nitfol_la_SOURCES = automap.c automap.h binary.h copying.h debug.c debug.h \ $(BLORB) \ $(SOUND) nodist_nitfol_la_SOURCES = copying.c dbg_help.h startunix.c -nitfol_la_CPPFLAGS = -I$(top_srcdir) -DSMART_TOKENISER -DUSE_INLINE +nitfol_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara \ + -DSMART_TOKENISER -DUSE_INLINE nitfol_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) info_TEXINFOS = nitfol.texi diff --git a/interpreters/nitfol/blorb.c b/interpreters/nitfol/blorb.c index a83068b..aedb96f 100644 --- a/interpreters/nitfol/blorb.c +++ b/interpreters/nitfol/blorb.c @@ -1,5 +1,5 @@ #include "nitfol.h" -#include +#include "gi_blorb.h" /* Link this in only if your glk supports blorb */ diff --git a/interpreters/nitfol/main.c b/interpreters/nitfol/main.c index cbd8cde..ce0ceac 100644 --- a/interpreters/nitfol/main.c +++ b/interpreters/nitfol/main.c @@ -19,7 +19,7 @@ */ #include "nitfol.h" -#include +#include "gi_blorb.h" static void set_zfile(strid_t file) diff --git a/interpreters/nitfol/nitfol.h b/interpreters/nitfol/nitfol.h index 7aa50ed..319a536 100644 --- a/interpreters/nitfol/nitfol.h +++ b/interpreters/nitfol/nitfol.h @@ -24,7 +24,7 @@ #include /* For time() */ #include /* for isspace, isgraph, etc. */ #include -#include +#include "glk.h" #define GLK_EOF ((glsi32) -1) #define NITFOL_MAJOR 0 @@ -328,7 +328,7 @@ typedef enum { OBJ_GET_INFO, OBJ_RECEIVE, OBJ_MOVE } watchinfo; #include "z_io.h" #include "no_snd.h" -#include +#include "gi_blorb.h" #include "no_graph.h" #include "no_blorb.h" diff --git a/interpreters/nitfol/nitfol.info b/interpreters/nitfol/nitfol.info index fba02cc..2697079 100644 --- a/interpreters/nitfol/nitfol.info +++ b/interpreters/nitfol/nitfol.info @@ -1,5 +1,4 @@ -This is ../../../interpreters/nitfol/nitfol.info, produced by makeinfo -version 4.13 from ../../../interpreters/nitfol/nitfol.texi. +This is nitfol.info, produced by makeinfo version 4.13 from nitfol.texi. INFO-DIR-SECTION Games START-INFO-DIR-ENTRY @@ -1057,20 +1056,20 @@ File: nitfol.info, Node: Games Cited, Prev: Thanks, Up: Top  Tag Table: -Node: Top263 -Node: Invoking nitfol1602 -Node: Features8478 -Node: Preferences9127 -Node: Infinite undo/redo10483 -Node: Aliases11257 -Node: Abbreviation Expansion13781 -Node: Typo correction14898 -Node: Automapping16812 -Node: Quetzal22591 -Node: Blorb24312 -Node: Debugger24738 -Node: Bugs31713 -Node: Thanks34768 -Node: Games Cited35184 +Node: Top205 +Node: Invoking nitfol1544 +Node: Features8420 +Node: Preferences9069 +Node: Infinite undo/redo10425 +Node: Aliases11199 +Node: Abbreviation Expansion13723 +Node: Typo correction14840 +Node: Automapping16754 +Node: Quetzal22533 +Node: Blorb24254 +Node: Debugger24680 +Node: Bugs31655 +Node: Thanks34710 +Node: Games Cited35126  End Tag Table diff --git a/interpreters/nitfol/no_blorb.c b/interpreters/nitfol/no_blorb.c index 4f1e122..0798545 100644 --- a/interpreters/nitfol/no_blorb.c +++ b/interpreters/nitfol/no_blorb.c @@ -1,5 +1,5 @@ #include "nitfol.h" -#include +#include "gi_blorb.h" /* Link this in only if your glk doesn't support blorb */ diff --git a/interpreters/nitfol/opt2glkc.pl b/interpreters/nitfol/opt2glkc.pl index 96a9b41..6f60a64 100644 --- a/interpreters/nitfol/opt2glkc.pl +++ b/interpreters/nitfol/opt2glkc.pl @@ -236,7 +236,7 @@ sub make_glk_unix #include #include #include \"$header\" -#include +#include \"glkstart.h\" static char *game_filename = NULL; -- 2.30.2