2019-05-07 03:24:02 +02:00
|
|
|
--- ./src/Makefile.orig 2019-04-16 14:41:09.000000000 +0000
|
|
|
|
|
+++ ./src/Makefile 2019-05-07 01:09:58.583727894 +0000
|
|
|
|
|
@@ -60,7 +60,7 @@
|
2017-08-10 02:50:42 +02:00
|
|
|
|
|
|
|
|
# Try to auto-detect target OS.
|
2018-05-19 00:55:20 +02:00
|
|
|
OS = $(shell uname)
|
2017-08-10 02:50:42 +02:00
|
|
|
-USR = /usr
|
|
|
|
|
+USR = $(PREFIX)
|
|
|
|
|
LIB = lib
|
|
|
|
|
BIN = bin
|
|
|
|
|
INCLUDE = include
|
2019-05-07 03:24:02 +02:00
|
|
|
@@ -146,9 +146,7 @@
|
2017-08-10 02:50:42 +02:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifdef NOSTRIP
|
|
|
|
|
-STRIP = echo skip strip
|
|
|
|
|
-else
|
|
|
|
|
-STRIP = strip
|
|
|
|
|
+STRIP = echo skip stripe
|
|
|
|
|
endif
|
|
|
|
|
|
2018-05-19 00:55:20 +02:00
|
|
|
ifndef QMAKE
|
2019-05-07 03:24:02 +02:00
|
|
|
@@ -199,7 +197,7 @@
|
2018-05-19 00:55:20 +02:00
|
|
|
# Enable multi-threading support.
|
2017-08-10 02:50:42 +02:00
|
|
|
PARALLEL_CFLAGS = -Dgmic_is_parallel
|
|
|
|
|
ifneq ($(OS),Windows)
|
|
|
|
|
-PARALLEL_LIBS = -lpthread
|
|
|
|
|
+PARALLEL_LIBS = #-lpthread
|
|
|
|
|
endif
|
|
|
|
|
|
2018-05-19 00:55:20 +02:00
|
|
|
# Enable parallelization in CImg, using OpenMP.
|
2019-05-07 03:24:02 +02:00
|
|
|
@@ -339,8 +337,8 @@
|
|
|
|
|
GMIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(EIGEN_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)
|
|
|
|
|
GMIC_CLI_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(EIGEN_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)
|
2017-08-10 02:50:42 +02:00
|
|
|
ifeq ($(OS),Unix) # Unix.
|
|
|
|
|
-GMIC_CLI_CFLAGS += $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS)
|
|
|
|
|
-GMIC_CLI_LIBS += $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS)
|
|
|
|
|
+GMIC_CLI_CFLAGS += $(MAGICK_CFLAGS) # $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS)
|
|
|
|
|
+GMIC_CLI_LIBS += $(MAGICK_LIBS) # $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS)
|
|
|
|
|
else
|
|
|
|
|
ifeq ($(OS),Darwin) # MacOSX.
|
2018-05-19 00:55:20 +02:00
|
|
|
GMIC_CLI_CFLAGS += $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS)
|
2019-05-07 03:24:02 +02:00
|
|
|
@@ -352,15 +350,14 @@
|
2017-08-10 02:50:42 +02:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
cli:
|
2018-05-19 00:55:20 +02:00
|
|
|
- $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" _cli
|
2017-08-10 02:50:42 +02:00
|
|
|
- $(STRIP) gmic$(EXE)
|
2019-05-07 00:02:58 +02:00
|
|
|
+ $(MAKE) "CFLAGS+= $(CXXFLAGS) $(GMIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" _cli
|
2017-08-10 02:50:42 +02:00
|
|
|
|
2018-05-19 00:55:20 +02:00
|
|
|
debug:
|
|
|
|
|
$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" _cli
|
2019-05-07 03:24:02 +02:00
|
|
|
|
|
|
|
|
_cli: check_versions gmic.cpp gmic.h gmic_stdlib.h CImg.h
|
|
|
|
|
$(CXX) -o gmic_cli.o -c gmic.cpp $(CFLAGS)
|
|
|
|
|
- $(CXX) -o gmic gmic_cli.cpp gmic_cli.o $(CFLAGS) $(LIBS)
|
|
|
|
|
+ $(CXX) -o gmic gmic_cli.cpp gmic_cli.o $(CFLAGS) $(LIBS) $(LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# CLI (static)
|
|
|
|
|
#-------------
|
