Re: GRX

-- Maurice Lombardi Laboratoire de Spectrometrie Physique, Universite Joseph Fourier de Grenoble, BP87 38402 Saint Martin d'Heres Cedex FRANCE Tel: 33 (0)4 76 51 47 51 Fax: 33 (0)4 76 63 54 95 mailto:Maurice.Lombardi@ujf-grenoble.fr --- grx244.orig\pascal\makefile Sun Dec 16 19:04:42 2001 +++ grx244\pascal\makefile Wed Jan 2 19:11:48 2002 @@ -12,7 +12,7 @@ COMPILER = gpc --automake -Wall # Needed libraries (at least jpeg and tiff) -LIBRARIES= -ljpeg -ltiff +LIBRARIES= -ljpeg -ltiff -lpng -lz # -------------------------------------------- # I Think, you don't need to change from here @@ -41,13 +41,13 @@ jpgtest:jpgtest.pas $(COMPILER) $(GRXLIB) $(GRAPHICSLIB) $(LIBRARIES) jpgtest.pas -ojpgtest -colortest:colortest.pas - $(COMPILER) $(GRXLIB) $(GRAPHICSLIB) $(LIBRARIES) colortest.pas -ocolortest +colortst:colortst.pas + $(COMPILER) $(GRXLIB) $(GRAPHICSLIB) $(LIBRARIES) colortst.pas -ocolortst -imgviewer:imgviewer.pas - $(COMPILER) $(GRXLIB) $(GRAPHICSLIB) $(LIBRARIES) imgviewer.pas -oimgviewer +imgview:imgview.pas + $(COMPILER) $(GRXLIB) $(GRAPHICSLIB) $(LIBRARIES) imgview.pas -oimgview clean: - rm -f *.o *.gpi blt_test modetest taste txt_test vir_test polytest jpgtest colortest imgviewer + rm -f *.o *.gpi blt_test modetest taste txt_test vir_test polytest jpgtest colortst imgview --- grx244.orig\pascal\makefile.dj2 Sun Dec 16 19:09:50 2001 +++ grx244\pascal\makefile.dj2 Wed Jan 2 18:58:22 2002 @@ -12,20 +12,7 @@ GRXLIB = ../lib/$(GRX_LIB_SUBDIR)/libgrx20.a GRXLIBPATH = -L../lib/$(GRX_LIB_SUBDIR) -ADDON_LIBS= -ifeq ($(HAVE_LIBTIFF),y) - ADDON_LIBS += -ltiff -endif - -ifeq ($(HAVE_LIBJPEG),y) - ADDON_LIBS += -ljpeg -endif - -ifeq ($(NEED_ZLIB),y) - ADDON_LIBS += -lz -endif - -LIBS= $(GRXLIBPATH) $(GRXLIB) $(ADDON_LIBS) +LIBS= $(GRXLIBPATH) $(GRXLIB) # Compiler and options on your system COMPILER = gpc --automake --- grx244.orig\pascal\makefile.w32 Sun Dec 16 19:10:10 2001 +++ grx244\pascal\makefile.w32 Wed Jan 2 19:02:40 2002 @@ -12,20 +12,7 @@ GRXLIB = ../lib/$(GRX_LIB_SUBDIR)/libgrx20.a GRXLIBPATH = -L../lib/$(GRX_LIB_SUBDIR) -ADDON_LIBS= -ifeq ($(HAVE_LIBTIFF),y) - ADDON_LIBS += -ltiff -endif - -ifeq ($(HAVE_LIBJPEG),y) - ADDON_LIBS += -ljpeg -endif - -ifeq ($(NEED_ZLIB),y) - ADDON_LIBS += -lz -endif - -LIBS= $(GRXLIBPATH) $(GRXLIB) $(ADDON_LIBS) -mwindows -mconsole +LIBS= $(GRXLIBPATH) $(GRXLIB) -mwindows -mconsole # Compiler and options on your system COMPILER = gpc --autobuild --gpc-main=GRXMain --- grx244.orig\pascal\makefile.lnx Sun Dec 16 19:10:28 2001 +++ grx244\pascal\makefile.lnx Wed Jan 2 19:00:42 2002 @@ -11,21 +11,7 @@ GRXLIB = ../lib/$(GRX_LIB_SUBDIR)/libgrx20.a GRXLIBPATH = -L../lib/$(GRX_LIB_SUBDIR) -ADDON_LIBS= -lvga - -ifeq ($(HAVE_LIBTIFF),y) - ADDON_LIBS += -ltiff -endif - -ifeq ($(HAVE_LIBJPEG),y) - ADDON_LIBS += -ljpeg -endif - -ifeq ($(NEED_ZLIB),y) - ADDON_LIBS += -lz -endif - -LIBS= $(GRXLIBPATH) $(GRXLIB) $(ADDON_LIBS) -lm +LIBS= $(GRXLIBPATH) $(GRXLIB) -lvga -lm # Compiler and options on your system COMPILER = gpc --automake --- grx244.orig\pascal\makefile.x11 Sun Dec 16 19:10:48 2001 +++ grx244\pascal\makefile.x11 Wed Jan 2 19:04:38 2002 @@ -11,21 +11,7 @@ GRXLIB = ../lib/$(GRX_LIB_SUBDIR)/libgrx20X.a GRXLIBPATH = -L../lib/$(GRX_LIB_SUBDIR) -ADDON_LIBS= - -ifeq ($(HAVE_LIBTIFF),y) - ADDON_LIBS += -ltiff -endif - -ifeq ($(HAVE_LIBJPEG),y) - ADDON_LIBS += -ljpeg -endif - -ifeq ($(NEED_ZLIB),y) - ADDON_LIBS += -lz -endif - -LIBS= $(GRXLIBPATH) $(GRXLIB) $(ADDON_LIBS) $(X11LIBS) -lm +LIBS= $(GRXLIBPATH) $(GRXLIB) $(X11LIBS) -lm # Compiler and options on your system COMPILER = gpc --automake