44 lines
2.7 KiB
Diff
44 lines
2.7 KiB
Diff
|
Index: gmic-1.5.8.4/src/Makefile
|
||
|
|
===================================================================
|
||
|
|
--- gmic-1.5.8.4.orig/src/Makefile
|
||
|
|
+++ gmic-1.5.8.4/src/Makefile
|
||
|
|
@@ -122,10 +122,10 @@ endif
|
||
|
|
# 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_LDFLAGS = -L/usr/X11R6/$(LIB) -lX11 -lpthread #-lXrandr
|
||
|
|
+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include -Dcimg_use_xrandr
|
||
|
|
+X11_LDFLAGS = -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).
|
||
|
|
@@ -220,19 +220,19 @@ BOARD_LDFLAGS = -lboard
|
||
|
|
# Predefined sets of flags for different default configurations.
|
||
|
|
#----------------------------------------------------------------
|
||
|
|
|
||
|
|
# Unix : Standard build.
|
||
|
|
-STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(X11_CFLAGS) $(PNG_CFLAGS) \
|
||
|
|
+STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
|
||
|
|
$(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
|
||
|
|
- $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(XSHM_CFLAGS) $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
|
||
|
|
-STD_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(PNG_LDFLAGS) \
|
||
|
|
+ $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
|
||
|
|
+STD_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \
|
||
|
|
$(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
|
||
|
|
- $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(XSHM_LDFLAGS) $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) # $(MAGICK_LDFLAGS)
|
||
|
|
+ $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) # $(MAGICK_LDFLAGS)
|
||
|
|
|
||
|
|
# Unix : Minimal build.
|
||
|
|
-MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) \
|
||
|
|
+MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) \
|
||
|
|
${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) # $(OPENCV_CFLAGS)
|
||
|
|
-MINIMAL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) \
|
||
|
|
+MINIMAL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) \
|
||
|
|
${TIFF_LDFLAGS} ${PNG_LDFLAGS} $(ZLIB_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS)
|
||
|
|
|
||
|
|
# Unix : Static build.
|
||
|
|
STATIC_PATH = /usr/$(LIB)/
|