diff -ru pl230src.orig/src/Makefile pl230src/src/Makefile --- pl230src.orig/src/Makefile 2004-08-27 05:17:44.000000000 +0930 +++ pl230src/src/Makefile 2004-09-26 10:22:12.335543912 +0930 @@ -121,11 +121,11 @@ #### For PNG (only) uncomment the following.. (this will use a version of GD that comes #### bundled with ploticus; you need to have libpng and zlib ). Set GD16H if your #### png.h or other header files are in a nonstandard place, eg GD16H = -I/home/scg/lib -ploticus: plpng -PLPNG = pl -GD16LIBS = -lpng -lz -GD16H = -ZFLAG = -DWZ +# ploticus: plpng +# PLPNG = pl +# GD16LIBS = -lpng -lz +# GD16H = +# ZFLAG = -DWZ #### For pseudo-GIF (only) uncomment the following.. (this will use a version of GD that @@ -147,18 +147,18 @@ #### uncomment the following.. (gd 1.84+, libpng, zlib, libjpeg required). Set GD18H if your #### png.h or other header files are in a nonstandard place, eg GD18H = -I/home/scg/lib -# ploticus: plgd18 -# GD18LIBS = -lgd -lpng -lz -ljpeg -# GD18H = +#ploticus: plgd18 +#GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype +#GD18H = # GDFREETYPE = -# ZFLAG = -DWZ +#ZFLAG = -DWZ #### For JPEG, WBMP, PNG, and FreeType2, using your copy of GD 1.84+, ###### #### uncomment the following.. (gd 1.84+, libpng, zlib, libjpeg, libfreetype ###### #### are all required). Set GDFONTPATH to directory containing .ttf files ###### -# ploticus: plgd18 -# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype +#ploticus: plgd18 +# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype -lfreetype # GD18H = # GDFREETYPE = -DGDFREETYPE # ZFLAG = -DWZ @@ -168,6 +168,10 @@ # ploticus: plnogd # NOGDFLAG = -DNOGD +EXE=pl +ploticus: $(EXE) + + ################################################################ @@ -176,7 +180,7 @@ ################################################################ #### If you plan to do a "make install", where do you want the executable(s) to be moved to? -BIN = /usr/local/bin +BIN = /usr/bin #### To set a hard-coded directory for prefabs files, uncomment & edit the following.. @@ -219,7 +223,7 @@ # ..and if your ming.h is in a nonstandard place add a line like this: # MINGH = -I/home/scg/lib #### Otherwise, for no SWF capability, uncomment the following line -NOSWFFLAG = -DNOSWF +# NOSWFFLAG = -DNOSWF #### To completely remove safety limits on cpu time uncomment the following.. @@ -252,7 +256,7 @@ LIBS = $(XLIBS) -lm $(ADDLIBS) -CFLAGS = -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \ +CFLAGS += -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) $(GDLEVEL) \ $(NOGDFLAG) $(NOXFLAG) $(NOPSFLAG) $(NOSVGFLAG) $(NOSWFFLAG) $(INCLUDEDIRS) \ $(MINGH) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\" @@ -269,39 +273,39 @@ $(LOCALEOBJ) pl: pl.o $(OBJ) $(XOBJ) gd00files gd13files - $(CC) pl.o $(FLAGS) $(OBJ) $(GD13) $(GD) $(XOBJ) $(LIBS) $(ZLIB) $(MING) -o $(PL) + $(CC) pl.o $(CFLAGS) $(OBJ) $(GD13) $(GD) $(XOBJ) $(LIBS) $(ZLIB) $(MING) -o $(PL) plpng: pl.o $(OBJ) $(XOBJ) gd00files gd16files - $(CC) pl.o $(FLAGS) $(OBJ) $(GD16) $(GD) $(XOBJ) $(GD16LIBS) $(LIBS) $(MING) -o $(PLPNG) + $(CC) pl.o $(CFLAGS) $(OBJ) $(GD16) $(GD) $(XOBJ) $(GD16LIBS) $(LIBS) $(MING) -o $(PLPNG) gd00files: - $(CC) -I./gd13 -I./ -c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c + $(CC) $(CFLAGS) -I./gd13 -I./ -c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c echo "done with gd00files" > gd00files gd13files: - $(CC) -c grgd.c -DGD13 -I./gd13 -o grgd13.o + $(CC) -c $(CFLAGS) grgd.c -DGD13 -I./gd13 -o grgd13.o $(CC) -c $(CFLAGS) devstuff.c -DGD13 -o devstuff13.o - $(CC) -c gd13.c -I./gd13 + $(CC) -c $(CFLAGS) gd13.c -I./gd13 echo "done with gd13files" > gd13files gd16files: - $(CC) -c grgd.c -DGD16 -I./ -I./gd16 -o grgd16.o + $(CC) -c $(CFLAGS) grgd.c -DGD16 -I./ -I./gd16 -o grgd16.o $(CC) -c $(CFLAGS) devstuff.c -DGD16 -o devstuff16.o - $(CC) -c -I./gd16 -I./ $(GD16H) gd16.c gd_io.c gd_io_dp.c gd_io_file.c gd_png.c + $(CC) -c $(CFLAGS) -I./gd16 -I./ $(GD16H) gd16.c gd_io.c gd_io_dp.c gd_io_file.c gd_png.c echo "done with gd16files" > gd16files # GD18: plgd18: pl.o $(OBJ) $(XOBJ) gd18files - $(CC) $(FLAGS) pl.o grgd.o devstuff.o $(OBJ) $(XOBJ) $(GD18LIBS) $(LIBS) $(MING) -o $(PL) + $(CC) $(CFLAGS) pl.o grgd.o devstuff.o $(OBJ) $(XOBJ) $(GD18LIBS) $(LIBS) $(MING) -o $(PL) gd18files: - $(CC) -c grgd.c devstuff.c -DGD18 $(GDFREETYPE) $(GD18H) $(CFLAGS) + $(CC) -c $(CFLAGS) grgd.c devstuff.c -DGD18 $(GDFREETYPE) $(GD18H) # NOGD: plnogd: pl.o $(OBJ) $(XOBJ) nogdfiles - $(CC) $(FLAGS) pl.o devstuff.o $(OBJ) $(XOBJ) $(LIBS) $(ZLIB) $(MING) -o $(PL) + $(CC) $(CFLAGS) pl.o devstuff.o $(OBJ) $(XOBJ) $(LIBS) $(ZLIB) $(MING) -o $(PL) nogdfiles: $(CC) -c devstuff.c $(CFLAGS) @@ -309,7 +313,7 @@ install: - mv $(EXE) $(BIN) + mv $(EXE) $(DESTDIR)$(BIN) clean: $(RMCOM) *.o gd??files diff -ru pl230src.orig/src/interact.c pl230src/src/interact.c --- pl230src.orig/src/interact.c 2004-08-05 00:25:20.000000000 +0930 +++ pl230src/src/interact.c 2004-09-26 10:03:34.308545112 +0930 @@ -84,7 +84,7 @@ /* =================================== */ /* GETCLICK wait until a key or button is hit.. */ /* when using postscript, this will do a showpage and return. */ - +#ifndef NOX11 PLG_getclick() { double x, y; @@ -100,6 +100,7 @@ return( Egetkey( &x, &y, &e ) ); } +#endif /* ================================ */ /* HE This gets called by the X11 driver when we are waiting for an event