Attachment #176840 for bug #253098





case "$lowpath" in
    *.taf ) $dirpath/gargoyle-scare "$1" ;;
    *.dat ) $dirpath/gargoyle-advsys "$1" ;;
    *.agx ) $dirpath/gargoyle-agility "$1" ;;
    *.d\$\$ ) $dirpath/gargoyle-agility "$1" ;;
    *.acd ) $dirpath/gargoyle-alan2 "$1" ;;
    *.a3c ) $dirpath/gargoyle-alan3 "$1" ;;
    *.asl ) $dirpath/gargoyle-geas "$1" ;;
    *.cas ) $dirpath/gargoyle-geas "$1" ;;
    *.ulx ) $dirpath/gargoyle-git "$1" ;;
    *.hex ) $dirpath/gargoyle-hugo "$1" ;;
    *.jacl ) $dirpath/gargoyle-jacl "$1" ;;
    *.j2  ) $dirpath/gargoyle-jacl "$1" ;;
    *.l9  ) $dirpath/gargoyle-level9 "$1" ;;
    *.sna ) $dirpath/gargoyle-level9 "$1" ;;
    *.mag ) $dirpath/gargoyle-magnetic "$1" ;;
    *.gam ) $dirpath/gargoyle-tadsr "$1" ;;
    *.t3  ) $dirpath/gargoyle-tadsr "$1" ;;
    *.z?  ) $dirpath/gargoyle-frotz "$1" ;;

    *.blb    ) $dirpath/gargoyle-git "$1" ;;
    *.blorb  ) $dirpath/gargoyle-git "$1" ;;
    *.glb    ) $dirpath/gargoyle-git "$1" ;;
    *.gblorb ) $dirpath/gargoyle-git "$1" ;;
    *.zlb    ) $dirpath/gargoyle-frotz "$1" ;;
    *.zblorb ) $dirpath/gargoyle-frotz "$1" ;;

    * ) echo "gargoyle: Unknown file type: $1" ;;

Lines 60-64 Link Here

(-)gargoyle-orig/tads/Jamfile (-4 / +4 lines)
60	SEARCH_SOURCE = $(SUBDIR) ;	60	SEARCH_SOURCE = $(SUBDIR) ;
61		61
62	Main tadsr :	62	Main gargoyle-tadsr :
63	t23run.cpp	63	t23run.cpp
64	osansi1.c osansi2.c osansi3.c	64	osansi1.c osansi2.c osansi3.c
Lines 73-80 Link Here
73	;	73	;
74		74
75	LinkLibraries tadsr : libtads2 libtads3 ;	75	LinkLibraries gargoyle-tadsr : libtads2 libtads3 ;
76		76
77	LINK on tadsr$(SUFEXE) = $(C++) ;	77	LINK on gargoyle-tadsr$(SUFEXE) = $(C++) ;
78		78
79	APPS += tadsr ;	79	APPS += gargoyle-tadsr ;
80		80




    SubDirCcFlags -w ;

    Main gargoyle-advsys :
        advmsg.c advtrm.c advprs.c advdbs.c advint.c advjunk.c advexe.c
        glkstart.c ;

    APPS += gargoyle-advsys ;
}


    SubDirCcFlags -DGLK_ANSI_ONLY ;

    Main gargoyle-agility :
        agtread.c gamedata.c util.c agxfile.c auxfile.c filename.c
        parser.c exec.c runverb.c metacommand.c savegame.c debugcmd.c

        ;

    APPS += gargoyle-agility ;
}


    SubDirCcFlags -funsigned-char -Wno-parentheses -DGLK -DREVERSED ;

    Main gargoyle-alan2 :
        arun.c main.c debug.c args.c exe.c inter.c parse.c rules.c stack.c
        decode.c term.c reverse.c readline.c params.c sysdep.c

        ;

    APPS += gargoyle-alan2 ;
}


    SubDirCcFlags -funsigned-char -DGLK ;

    Main gargoyle-alan3 :
        arun.c main.c debug.c args.c exe.c inter.c parse.c rules.c stack.c
        decode.c term.c reverse.c readline.c params.c sysdep.c

        ;

    APPS += gargoyle-alan3 ;
}


    ObjDir frotz ;

    Main gargoyle-frotz :
        buffer.c err.c fastmem.c files.c
        input.c main.c math.c object.c process.c quetzal.c random.c

        ;

    APPS += gargoyle-frotz ;
}


    SubDirC++Flags = $(SUBDIRCCFLAGS) ;

    Main gargoyle-geas :
        geasfile.cc geas-runner.cc geas-state.cc
        geas-util.cc geasglk.cc geasglkterm.c

    LINK on geas$(SUFEXE) = $(C++) ;

    APPS += gargoyle-geas ;
}


    SubDirCcFlags -DUSE_INLINE ;

    Main gargoyle-git :
        git.c memory.c compiler.c opcodes.c operands.c
        peephole.c terp.c glkop.c search.c git_unix.c

        ;

    APPS += gargoyle-git ;
}


    if $(OS) != MINGW { SubDirCcFlags -DOS_UNIX ; }

    Main gargoyle-glulxe :
        main.c files.c vm.c exec.c funcs.c operand.c string.c glkop.c
        heap.c serial.c search.c gestalt.c osdepend.c unixstrt.c
        ;

    APPS += gargoyle-glulxe ;
}


        [ FDirName $(SUBDIR) heglk ] ;

    Main gargoyle-hugo :
        he.c heexpr.c hemisc.c heobject.c heparse.c heres.c herun.c heset.c 
        stringfn.c heglk.c heglkunix.c
        ;

    APPS += gargoyle-hugo ;
}


    SubDirCcFlags -DGARGLK ;

    Main gargoyle-jacl :
        jacl.c glk_startup.c findroute.c interpreter.c loader.c 
        glk_saver.c logging.c parser.c display.c utils.c jpp.c 

        ;

    APPS += gargoyle-jacl ;
}


        [ FDirName $(SUBDIR) Glk ] ;

    Main gargoyle-level9 : level9.c glk.c ;

    APPS += gargoyle-level9 ;
}


    # SubDirCcFlags -DNOBORDER ;

    Main gargoyle-magnetic : emu.c glk.c ;

    APPS += gargoyle-magnetic ;
}


        sound.c graphics.c blorb.c 
        ;
    Main gargoyle-nitfol : main.c startunix.c ;
    LinkLibraries gargoyle-nitfol : libnitfol ;

    APPS += gargoyle-nitfol ;
}


    }

    Main gargoyle-scare :
        sctafpar.c sctaffil.c scprops.c scvars.c scexpr.c scprintf.c
        scinterf.c scparser.c sclibrar.c scrunner.c scevents.c scnpcs.c

        ;

    APPS += gargoyle-scare ;
}


Return to bug 253098

Lines 50-78 Link Here

(-)gargoyle-orig/garglk/launcher.sh (-24 / +24 lines)
50		50
51	case "$lowpath" in	51	case "$lowpath" in
52	*.taf ) $dirpath/scare "$1" ;;	52	*.taf ) $dirpath/gargoyle-scare "$1" ;;
53	*.dat ) $dirpath/advsys "$1" ;;	53	*.dat ) $dirpath/gargoyle-advsys "$1" ;;
54	*.agx ) $dirpath/agility "$1" ;;	54	*.agx ) $dirpath/gargoyle-agility "$1" ;;
55	*.d\$\$ ) $dirpath/agility "$1" ;;	55	*.d\$\$ ) $dirpath/gargoyle-agility "$1" ;;
56	*.acd ) $dirpath/alan2 "$1" ;;	56	*.acd ) $dirpath/gargoyle-alan2 "$1" ;;
57	*.a3c ) $dirpath/alan3 "$1" ;;	57	*.a3c ) $dirpath/gargoyle-alan3 "$1" ;;
58	*.asl ) $dirpath/geas "$1" ;;	58	*.asl ) $dirpath/gargoyle-geas "$1" ;;
59	*.cas ) $dirpath/geas "$1" ;;	59	*.cas ) $dirpath/gargoyle-geas "$1" ;;
60	*.ulx ) $dirpath/git "$1" ;;	60	*.ulx ) $dirpath/gargoyle-git "$1" ;;
61	*.hex ) $dirpath/hugo "$1" ;;	61	*.hex ) $dirpath/gargoyle-hugo "$1" ;;
62	*.jacl ) $dirpath/jacl "$1" ;;	62	*.jacl ) $dirpath/gargoyle-jacl "$1" ;;
63	*.j2 ) $dirpath/jacl "$1" ;;	63	*.j2 ) $dirpath/gargoyle-jacl "$1" ;;
64	*.l9 ) $dirpath/level9 "$1" ;;	64	*.l9 ) $dirpath/gargoyle-level9 "$1" ;;
65	*.sna ) $dirpath/level9 "$1" ;;	65	*.sna ) $dirpath/gargoyle-level9 "$1" ;;
66	*.mag ) $dirpath/magnetic "$1" ;;	66	*.mag ) $dirpath/gargoyle-magnetic "$1" ;;
67	*.gam ) $dirpath/tadsr "$1" ;;	67	*.gam ) $dirpath/gargoyle-tadsr "$1" ;;
68	*.t3 ) $dirpath/tadsr "$1" ;;	68	*.t3 ) $dirpath/gargoyle-tadsr "$1" ;;
69	*.z? ) $dirpath/frotz "$1" ;;	69	*.z? ) $dirpath/gargoyle-frotz "$1" ;;
70		70
71	*.blb ) $dirpath/git "$1" ;;	71	*.blb ) $dirpath/gargoyle-git "$1" ;;
72	*.blorb ) $dirpath/git "$1" ;;	72	*.blorb ) $dirpath/gargoyle-git "$1" ;;
73	*.glb ) $dirpath/git "$1" ;;	73	*.glb ) $dirpath/gargoyle-git "$1" ;;
74	*.gblorb ) $dirpath/git "$1" ;;	74	*.gblorb ) $dirpath/gargoyle-git "$1" ;;
75	*.zlb ) $dirpath/frotz "$1" ;;	75	*.zlb ) $dirpath/gargoyle-frotz "$1" ;;
76	*.zblorb ) $dirpath/frotz "$1" ;;	76	*.zblorb ) $dirpath/gargoyle-frotz "$1" ;;
77		77
78	* ) echo "gargoyle: Unknown file type: $1" ;;	78	* ) echo "gargoyle: Unknown file type: $1" ;;

Lines 34-42 Link Here

(-)gargoyle-orig/terps/Jamfile (-29 / +29 lines)
34	SubDirCcFlags -w ;	34	SubDirCcFlags -w ;
35		35
36	Main advsys :	36	Main gargoyle-advsys :
37	advmsg.c advtrm.c advprs.c advdbs.c advint.c advjunk.c advexe.c	37	advmsg.c advtrm.c advprs.c advdbs.c advint.c advjunk.c advexe.c
38	glkstart.c ;	38	glkstart.c ;
39		39
40	APPS += advsys ;	40	APPS += gargoyle-advsys ;
41	}	41	}
42		42
Lines 60-64 Link Here
60	SubDirCcFlags -DGLK_ANSI_ONLY ;	60	SubDirCcFlags -DGLK_ANSI_ONLY ;
61		61
62	Main agility :	62	Main gargoyle-agility :
63	agtread.c gamedata.c util.c agxfile.c auxfile.c filename.c	63	agtread.c gamedata.c util.c agxfile.c auxfile.c filename.c
64	parser.c exec.c runverb.c metacommand.c savegame.c debugcmd.c	64	parser.c exec.c runverb.c metacommand.c savegame.c debugcmd.c
Lines 67-71 Link Here
67	;	67	;
68		68
69	APPS += agility ;	69	APPS += gargoyle-agility ;
70	}	70	}
71		71
Lines 85-89 Link Here
85	SubDirCcFlags -funsigned-char -Wno-parentheses -DGLK -DREVERSED ;	85	SubDirCcFlags -funsigned-char -Wno-parentheses -DGLK -DREVERSED ;
86		86
87	Main alan2 :	87	Main gargoyle-alan2 :
88	arun.c main.c debug.c args.c exe.c inter.c parse.c rules.c stack.c	88	arun.c main.c debug.c args.c exe.c inter.c parse.c rules.c stack.c
89	decode.c term.c reverse.c readline.c params.c sysdep.c	89	decode.c term.c reverse.c readline.c params.c sysdep.c
Lines 91-95 Link Here
91	;	91	;
92		92
93	APPS += alan2 ;	93	APPS += gargoyle-alan2 ;
94	}	94	}
95		95
Lines 108-112 Link Here
108	SubDirCcFlags -funsigned-char -DGLK ;	108	SubDirCcFlags -funsigned-char -DGLK ;
109		109
110	Main alan3 :	110	Main gargoyle-alan3 :
111	arun.c main.c debug.c args.c exe.c inter.c parse.c rules.c stack.c	111	arun.c main.c debug.c args.c exe.c inter.c parse.c rules.c stack.c
112	decode.c term.c reverse.c readline.c params.c sysdep.c	112	decode.c term.c reverse.c readline.c params.c sysdep.c
Lines 115-119 Link Here
115	;	115	;
116		116
117	APPS += alan3 ;	117	APPS += gargoyle-alan3 ;
118	}	118	}
119		119
Lines 128-132 Link Here
128	ObjDir frotz ;	128	ObjDir frotz ;
129		129
130	Main frotz :	130	Main gargoyle-frotz :
131	buffer.c err.c fastmem.c files.c	131	buffer.c err.c fastmem.c files.c
132	input.c main.c math.c object.c process.c quetzal.c random.c	132	input.c main.c math.c object.c process.c quetzal.c random.c
Lines 135-139 Link Here
135	;	135	;
136		136
137	APPS += frotz ;	137	APPS += gargoyle-frotz ;
138	}	138	}
139		139
Lines 151-155 Link Here
151	SubDirC++Flags = $(SUBDIRCCFLAGS) ;	151	SubDirC++Flags = $(SUBDIRCCFLAGS) ;
152		152
153	Main geas :	153	Main gargoyle-geas :
154	geasfile.cc geas-runner.cc geas-state.cc	154	geasfile.cc geas-runner.cc geas-state.cc
155	geas-util.cc geasglk.cc geasglkterm.c	155	geas-util.cc geasglk.cc geasglkterm.c
Lines 159-163 Link Here
159	LINK on geas$(SUFEXE) = $(C++) ;	159	LINK on geas$(SUFEXE) = $(C++) ;
160		160
161	APPS += geas ;	161	APPS += gargoyle-geas ;
162	}	162	}
163		163
Lines 176-180 Link Here
176	SubDirCcFlags -DUSE_INLINE ;	176	SubDirCcFlags -DUSE_INLINE ;
177		177
178	Main git :	178	Main gargoyle-git :
179	git.c memory.c compiler.c opcodes.c operands.c	179	git.c memory.c compiler.c opcodes.c operands.c
180	peephole.c terp.c glkop.c search.c git_unix.c	180	peephole.c terp.c glkop.c search.c git_unix.c
Lines 182-186 Link Here
182	;	182	;
183		183
184	APPS += git ;	184	APPS += gargoyle-git ;
185	}	185	}
186		186
Lines 197-206 Link Here
197	if $(OS) != MINGW { SubDirCcFlags -DOS_UNIX ; }	197	if $(OS) != MINGW { SubDirCcFlags -DOS_UNIX ; }
198		198
199	Main glulxe :	199	Main gargoyle-glulxe :
200	main.c files.c vm.c exec.c funcs.c operand.c string.c glkop.c	200	main.c files.c vm.c exec.c funcs.c operand.c string.c glkop.c
201	heap.c serial.c search.c gestalt.c osdepend.c unixstrt.c	201	heap.c serial.c search.c gestalt.c osdepend.c unixstrt.c
202	;	202	;
203		203
204	APPS += glulxe ;	204	APPS += gargoyle-glulxe ;
205	}	205	}
206		206
Lines 232-241 Link Here
232	[ FDirName $(SUBDIR) heglk ] ;	232	[ FDirName $(SUBDIR) heglk ] ;
233		233
234	Main hugo :	234	Main gargoyle-hugo :
235	he.c heexpr.c hemisc.c heobject.c heparse.c heres.c herun.c heset.c	235	he.c heexpr.c hemisc.c heobject.c heparse.c heres.c herun.c heset.c
236	stringfn.c heglk.c heglkunix.c	236	stringfn.c heglk.c heglkunix.c
237	;	237	;
238		238
239	APPS += hugo ;	239	APPS += gargoyle-hugo ;
240	}	240	}
241		241
Lines 252-256 Link Here
252	SubDirCcFlags -DGARGLK ;	252	SubDirCcFlags -DGARGLK ;
253		253
254	Main jacl :	254	Main gargoyle-jacl :
255	jacl.c glk_startup.c findroute.c interpreter.c loader.c	255	jacl.c glk_startup.c findroute.c interpreter.c loader.c
256	glk_saver.c logging.c parser.c display.c utils.c jpp.c	256	glk_saver.c logging.c parser.c display.c utils.c jpp.c
Lines 258-262 Link Here
258	;	258	;
259		259
260	APPS += jacl ;	260	APPS += gargoyle-jacl ;
261	}	261	}
262		262
Lines 284-290 Link Here
284	[ FDirName $(SUBDIR) Glk ] ;	284	[ FDirName $(SUBDIR) Glk ] ;
285		285
286	Main level9 : level9.c glk.c ;	286	Main gargoyle-level9 : level9.c glk.c ;
287		287
288	APPS += level9 ;	288	APPS += gargoyle-level9 ;
289	}	289	}
290		290
Lines 315-321 Link Here
315	# SubDirCcFlags -DNOBORDER ;	315	# SubDirCcFlags -DNOBORDER ;
316		316
317	Main magnetic : emu.c glk.c ;	317	Main gargoyle-magnetic : emu.c glk.c ;
318		318
319	APPS += magnetic ;	319	APPS += gargoyle-magnetic ;
320	}	320	}
321		321
Lines 362-369 Link Here
362	sound.c graphics.c blorb.c	362	sound.c graphics.c blorb.c
363	;	363	;
364	Main nitfol : main.c startunix.c ;	364	Main gargoyle-nitfol : main.c startunix.c ;
365	LinkLibraries nitfol : libnitfol ;	365	LinkLibraries gargoyle-nitfol : libnitfol ;
366		366
367	APPS += nitfol ;	367	APPS += gargoyle-nitfol ;
368	}	368	}
369		369
Lines 383-387 Link Here
383	}	383	}
384		384
385	Main scare :	385	Main gargoyle-scare :
386	sctafpar.c sctaffil.c scprops.c scvars.c scexpr.c scprintf.c	386	sctafpar.c sctaffil.c scprops.c scvars.c scexpr.c scprintf.c
387	scinterf.c scparser.c sclibrar.c scrunner.c scevents.c scnpcs.c	387	scinterf.c scparser.c sclibrar.c scrunner.c scevents.c scnpcs.c
Lines 390-394 Link Here
390	;	390	;
391		391
392	APPS += scare ;	392	APPS += gargoyle-scare ;
393	}	393	}
394		394