21 lines
1.2 KiB
Diff
21 lines
1.2 KiB
Diff
|
Index: gmic-1.5.5.2/src/Makefile
|
||
|
|
===================================================================
|
||
|
|
--- gmic-1.5.5.2.orig/src/Makefile
|
||
|
|
+++ gmic-1.5.5.2/src/Makefile
|
||
|
|
@@ -204,13 +204,13 @@ BOARD_LDFLAGS = -lboard
|
||
|
|
# Sets of flags for building different configurations.
|
||
|
|
STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
|
||
|
|
$(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
|
||
|
|
$(EXR_CFLAGS) $(FFTW_CFLAGS) $(OPENMP_CFLAGS) \
|
||
|
|
- $(OPENCV_CFLAGS) # $(FFMPEG_CFLAGS) # $(XSHM_CFLAGS) # $(MAGICK_CFLAGS)
|
||
|
|
+ $(OPENCV_CFLAGS) $(MAGICK_CFLAGS) # $(FFMPEG_CFLAGS) # $(XSHM_CFLAGS)
|
||
|
|
STD_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \
|
||
|
|
$(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
|
||
|
|
$(EXR_LDFLAGS) $(FFTW_LDFLAGS) $(OPENMP_LDFLAGS) \
|
||
|
|
- $(OPENCV_LDFLAGS) # $(FFMPEG_LDFLAGS) # $(XSHM_LDFLAGS) # $(MAGICK_LDFLAGS)
|
||
|
|
+ $(OPENCV_LDFLAGS) $(MAGICK_LDFLAGS) # $(FFMPEG_LDFLAGS) # $(XSHM_LDFLAGS)
|
||
|
|
|
||
|
|
CUST_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
|
||
|
|
$(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
|
||
|
|
$(FFTW_CFLAGS) $(EXR_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS) $(BOARD_CFLAGS) $(MINC2_CFLAGS) $(OPENCV_CFLAGS)
|