--- GREYCstoration-2.8.orig/src/Makefile 2008-03-10 20:31:56.000000000 +1100 +++ GREYCstoration-2.8/src/Makefile 2008-03-13 15:24:32.000000000 +1100 @@ -36,21 +36,22 @@ CIMG_XRANDR_FLAGS = -Dcimg_use_xrandr -lXrandr # Uncomment to enable native support for PNG image files, using the PNG library. -#CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz +CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz # Uncomment to enable native support for JPEG image files, using the JPEG library. -#CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg +CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg # Uncomment to enable native support for TIFF image files, using the TIFF library. -#CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff +CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff # Uncomment to enable native support of most classical image file formats, using the Magick++ library. #CIMG_MAGICK_FLAGS = -Dcimg_use_magick `Magick++-config --cppflags` `Magick++-config --cxxflags` `Magick++-config --ldflags` `Magick++-config --libs` # Uncomment to enable faster Discrete Fourier Transform computation, using the FFTW3 library -#CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3 +CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3 EXTRA_FLAGS = $(CIMG_X11_FLAGS) $(CIMG_STRICT_FLAGS) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS) +ARCHFLAGS = $(CIMG_X11_FLAGS) $(CIMG_STRICT_FLAGS) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS) # Compilation rules .cpp: @@ -58,7 +59,6 @@ @echo "** Compiling '$* ($(CIMG_VERSION))' with '`$(CC) -v 2>&1 | grep version`'" @echo $(CC) -o $* $< $(CFLAGS) $(LDFLAGS) $(ARCHFLAGS) - strip $* menu: @echo @echo "CImg Library $(CIMG_VERSION) : Examples" @@ -93,7 +93,6 @@ @echo "** Compiling 'greycstoration4gimp ($(CIMG_VERSION))' with '`$(CC) -v 2>&1 | grep version`'" @echo $(CC) -o greycstoration4gimp greycstoration4gimp.cpp `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread -O3 $(CFLAGS) - strip greycstoration4gimp # Linux/Mac OSX targets linux: make "ARCHFLAGS=$(EXTRA_FLAGS)" all