Thanks. Only some small mostly cosmetical patches:
- added variable GRX_VERSION in makedefs.gnu and used it in src/makefile.{lnx|x11} to generate name of shared libraries (It's forgotten again to bump it there. Perhaps it will be easier to remember it in one place) - main () returns int not void according to C standard - some comments in chr/addfonts.sh (I think we need them ...) Also perhaps chr/addfont.sh should not be DOS style text file.
Andris
--- grx233/chr/addfonts.sh~1 Thu Jan 11 22:09:54 2001 +++ grx233/chr/addfonts.sh Wed Jan 31 21:05:00 2001 @@ -1,8 +1,14 @@ #! /bin/sh - +# +# We are not distributing Borland BGI fonts with GRX. +# To add them to the library put .CHR files in this +# directory (where this script is located) and run it +# after building GRX +# rm -f *.o gcc -O2 ../src/bgi/bin2c.c -o bin2c.exe for x in *.chr; do + echo "Processing $x ..."; name=`basename $x | sed -e 's,.chr,,g'` ./bin2c $x _${name}_font $name.c gcc -c -O2 $name.c --- grx233/src/makefile.lnx~1 Thu Jan 11 22:09:56 2001 +++ grx233/src/makefile.lnx Wed Jan 31 21:00:04 2001 @@ -16,8 +16,9 @@ CCOPT += -fomit-frame-pointer endif
-GRX20SHli = ../lib/$(GRX_LIB_SUBDIR)/libgrx20.so.2 -GRX20SHna = $(GRX20SHli).2.3.2 +GRX20SH = ../lib/$(GRX_LIB_SUBDIR)/libgrx20.so +GRX20SHli = $(GRX20SH).$(word 1,$(subst ., ,$(GRX_VERSION))) +GRX20SHna = $(GRX20SH).$(GRX_VERSION)
GRX20ST = ../lib/$(GRX_LIB_SUBDIR)/libgrx20.a
--- grx233/src/makefile.x11~1 Thu Jan 11 22:09:56 2001 +++ grx233/src/makefile.x11 Wed Jan 31 21:00:20 2001 @@ -11,8 +11,9 @@
INCDIR= -I. -I./include -I../include $(X11INCS)
-GRX20SHli = ../lib/$(GRX_LIB_SUBDIR)/libgrx20X.so.2 -GRX20SHna = $(GRX20SHli).2.3.2 +GRX20SH = ../lib/$(GRX_LIB_SUBDIR)/libgrx20X.so +GRX20SHli = $(GRX20SH).$(word 1,$(subst ., ,$(GRX_VERSION))) +GRX20SHna = $(GRX20SH).$(GRX_VERSION)
GRX20ST = ../lib/$(GRX_LIB_SUBDIR)/libgrx20X.a
--- grx233/test/keys.c~1 Sun Jan 21 02:52:54 2001 +++ grx233/test/keys.c Wed Jan 31 20:38:50 2001 @@ -357,7 +357,7 @@
#define KEYS (sizeof(Keys)/sizeof(Keys[0]))
-void main(void) { +int main(void) { int spaces_count = 0; KeyEntry *kp; GrKeyType k; --- grx233/makedefs.gnu~1 Fri Jun 23 11:34:28 2000 +++ grx233/makedefs.gnu Wed Jan 31 20:53:48 2001 @@ -1,5 +1,9 @@ ##################### CONFIGURATION ######################
+# Specify version of GRX +# Currently only used to generate name of shared libraries for linux +GRX_VERSION=2.3.3 + # Specify if you have libtiff.a and corresponding .h files. # Change setting to 'y' if you have it, or to 'n' if not. HAVE_LIBTIFF=n