Index: gmic-1.6.5.0/src/Makefile =================================================================== --- gmic-1.6.5.0.orig/src/Makefile +++ gmic-1.6.5.0/src/Makefile @@ -140,10 +140,10 @@ OPENMP_LIBS = -lgomp # Flags to enable image display, using X11 # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too). # This requires the presence of the X11 include and library files. # (package 'libx11-dev' on Debian). -X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr -X11_LIBS = -L/usr/X11R6/$(LIB) -lX11 -lpthread #-lXrandr +X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include -Dcimg_use_xrandr +X11_LIBS = -L/usr/X11R6/$(LIB) -lX11 -lpthread -lXrandr # Flags to enable fast display, using XShm. # This requires the presence of the X11 extension include and library files. # (package 'libx11-dev' on Debian). @@ -236,10 +236,10 @@ BOARD_LIBS = -lboard #------------------------------- STD_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(CURL_CFLAGS) $(FFTW_CFLAGS) STD_CLI_LIBS = $(MANDATORY_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(CURL_LIBS) $(FFTW_LIBS) ifeq ($(OS),Unix) # Unix. -STD_CLI_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(EXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS) -STD_CLI_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(EXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS) +STD_CLI_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(EXR_CFLAGS) $(OPENCV_CFLAGS) # $(MAGICK_CFLAGS) +STD_CLI_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) $(EXR_LIBS) $(OPENCV_LIBS) # $(MAGICK_LIBS) else ifeq ($(OS),Darwin) # MacOSX. STD_CLI_CFLAGS += $(X11_CFLAGS) $(EXR_CFLAGS) STD_CLI_LIBS += $(X11_LIBS) $(EXR_LIBS) $(OPT_LIBS) @@ -266,10 +266,10 @@ STATIC_CLI_LIBS = $(PARALLEL_LIBS) \ #-------------------------------- STD_GIMP_CFLAGS = $(MANDATORY_CFLAGS) $(PNG_CFLAGS) $(CURL_CFLAGS) $(FFTW_CFLAGS) -Dcimg_use_rng STD_GIMP_LIBS = $(MANDATORY_LIBS) $(PNG_LIBS) $(CURL_LIBS) $(FFTW_LIBS) ifeq ($(OS),Unix) # Unix. -STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) -STD_GIMP_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) +STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) +STD_GIMP_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) else ifeq ($(OS),Darwin) # MaxOSX. STD_GIMP_CFLAGS += $(X11_CFLAGS) STD_GIMP_LIBS += $(X11_LIBS)