| 1 | --- ../cache/gmic-2.0.2/src/Makefile 2017-06-22 12:41:18.000000000 +0000 |
| 2 | +++ ./src/Makefile 2017-07-25 05:12:48.923623739 +0000 |
| 3 | @@ -51,7 +51,7 @@ |
| 4 | |
| 5 | # Try to auto-detect target OS. |
| 6 | OS := $(shell uname) |
| 7 | -USR = /usr |
| 8 | +USR = $(PREFIX) |
| 9 | LIB = lib |
| 10 | BIN = bin |
| 11 | INCLUDE = include |
| 12 | @@ -122,9 +122,7 @@ |
| 13 | endif |
| 14 | |
| 15 | ifdef NOSTRIP |
| 16 | -STRIP = echo skip strip |
| 17 | -else |
| 18 | -STRIP = strip |
| 19 | +STRIP = echo skip stripe |
| 20 | endif |
| 21 | |
| 22 | #------------------------------------------------- |
| 23 | @@ -175,7 +173,7 @@ |
| 24 | # Flags to enable parallel processing. |
| 25 | PARALLEL_CFLAGS = -Dgmic_is_parallel |
| 26 | ifneq ($(OS),Windows) |
| 27 | -PARALLEL_LIBS = -lpthread |
| 28 | +PARALLEL_LIBS = #-lpthread |
| 29 | endif |
| 30 | |
| 31 | # Flags to enable extra checking of image buffer pointers. |
| 32 | @@ -288,8 +286,8 @@ |
| 33 | GMIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) |
| 34 | GMIC_CLI_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) |
| 35 | ifeq ($(OS),Unix) # Unix. |
| 36 | -GMIC_CLI_CFLAGS += $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS) |
| 37 | -GMIC_CLI_LIBS += $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS) |
| 38 | +GMIC_CLI_CFLAGS += $(MAGICK_CFLAGS) # $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS) |
| 39 | +GMIC_CLI_LIBS += $(MAGICK_LIBS) # $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS) |
| 40 | else |
| 41 | ifeq ($(OS),Darwin) # MacOSX. |
| 42 | GMIC_CLI_CFLAGS += $(X11_CFLAGS) $(OPENEXR_CFLAGS) |
| 43 | @@ -415,8 +413,7 @@ |
| 44 | endif |
| 45 | |
| 46 | cli: |
| 47 | - $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" gmic |
| 48 | - $(STRIP) gmic$(EXE) |
| 49 | + $(MAKE) "CFLAGS+= $(CXXFLAGS) $(GMIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" gmic |
| 50 | |
| 51 | cli_s: |
| 52 | ifeq ($(OS),Darwin) |