47 lines
2.3 KiB
Diff
47 lines
2.3 KiB
Diff
diff -uNr gmic-2.9.7/src/Makefile gmic-2.9.7.mod/src/Makefile
|
|
--- gmic-2.9.7/src/Makefile 2021-04-07 14:55:16.000000000 +0000
|
|
+++ gmic-2.9.7.mod/src/Makefile 2021-05-04 16:08:14.407443228 +0000
|
|
@@ -207,7 +207,7 @@
|
|
# Enable multi-threading support.
|
|
PARALLEL_CFLAGS = -Dgmic_is_parallel
|
|
ifneq ($(OS),Windows)
|
|
-PARALLEL_LIBS = -lpthread
|
|
+#PARALLEL_LIBS = -lpthread
|
|
endif
|
|
|
|
# Enable parallelization in CImg, using OpenMP.
|
|
@@ -352,8 +352,8 @@
|
|
GMIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)
|
|
GMIC_CLI_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)
|
|
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 += $(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)
|
|
else
|
|
ifeq ($(OS),Darwin) # MacOSX
|
|
GMIC_CLI_CFLAGS += $(X11_CFLAGS) $(OPENEXR_CFLAGS) # $(OPENCV_CFLAGS)
|
|
@@ -366,7 +366,7 @@
|
|
|
|
cli:
|
|
$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(OPT_CLI_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS) $(OPT_LIBS)" _cli
|
|
- $(STRIP) gmic$(EXE)
|
|
+ $(STRIP) gmic$(EXE) gmic-gm$(EXE)
|
|
|
|
debug:
|
|
$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" _cli
|
|
@@ -381,8 +381,12 @@
|
|
$(MAKE) "CFLAGS+=$(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) -Dcimg_use_half -I/usr/include/OpenEXR -Dgmic_pixel_type=half" \
|
|
"LIBS+=$(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS)" _cli
|
|
|
|
-_cli: gmic_cli.o gmic.cpp gmic.h gmic_stdlib.h CImg.h
|
|
+_cli: gmic_cli_gm.o gmic_cli.o gmic.cpp gmic.h gmic_stdlib.h CImg.h
|
|
$(CXX) -o gmic gmic_cli.cpp gmic_cli.o $(CFLAGS) $(LIBS)
|
|
+ $(CXX) -o gmic-gm gmic_cli.cpp gmic_cli_gm.o $(CFLAGS) $(MAGICK_CFLAGS) $(LIBS) $(MAGICK_LIBS)
|
|
+
|
|
+gmic_cli_gm.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
|
|
+ $(CXX) -o gmic_cli_gm.o -c gmic.cpp $(CFLAGS) $(MAGICK_CFLAGS)
|
|
|
|
gmic_cli.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
|
|
$(CXX) -o gmic_cli.o -c gmic.cpp $(CFLAGS)
|