102 lines
4.3 KiB
Diff
102 lines
4.3 KiB
Diff
--- gmic-1.5.2.2/src/Makefile
|
|
+++ gmic-1.5.2.2/src/Makefile
|
|
@@ -77,7 +77,7 @@
|
|
|
|
# Flags that are mandatory to compile 'gmic'.
|
|
MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
|
|
-MANDATORY_LDFLAGS += -L$(USR)/lib
|
|
+MANDATORY_LDFLAGS +=
|
|
ifeq ($(IS_GCC),yes)
|
|
MANDATORY_CFLAGS += -Wall -W
|
|
MANDATORY_LDFLAGS += -lm
|
|
@@ -85,28 +85,20 @@
|
|
MANDATORY_CFLAGS+=$(IS_BETA_CFLAGS)
|
|
|
|
# Flags to enable debugging.
|
|
-DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3 -g
|
|
-
|
|
-# Flags to enable optimizations.
|
|
-ifeq ($(IS_GCC),yes)
|
|
-OPT_CFLAGS = -O3 # -fno-tree-pre # -ffast-math
|
|
-endif
|
|
-ifeq ($(CC),icc)
|
|
-OPT_CFLAGS = -O3 -ipo -no-prec-div -override-limits
|
|
-endif
|
|
+DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3
|
|
|
|
# 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\\\" #-Dcimg_use_xrandr
|
|
+X11_LDFLAGS = -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).
|
|
XSHM_CFLAGS = -Dcimg_use_xshm
|
|
-XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
|
|
+XSHM_LDFLAGS = -lXext
|
|
|
|
# Flags to enable image display, using GDI32.
|
|
# This requires the presence of the GDI32 include and library files.
|
|
@@ -152,14 +144,8 @@
|
|
# Flags to enable native support of webcams, using the OpenCV library.
|
|
# This requires the presence of the OpenCV include and library files.
|
|
# (package 'libcv3-2-dev' on Debian).
|
|
-ifeq ($(OS),Darwin)
|
|
OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
|
|
OPENCV_LDFLAGS = `pkg-config opencv --libs` #-> Use this for OpenCV 2.2.0 !
|
|
-else
|
|
-OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
|
|
-# OPENCV_LDFLAGS = -lcv -lhighgui
|
|
-OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui #-> Use this for OpenCV >= 2.2.0 !
|
|
-endif
|
|
|
|
# Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
|
|
# This requires the presence of the GraphicsMagick++ include and library files.
|
|
@@ -287,10 +273,10 @@
|
|
endif
|
|
|
|
gimp:
|
|
- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
|
|
+ $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp
|
|
|
|
lib:
|
|
- $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
|
|
+ $(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
|
|
|
|
zart: lib
|
|
ifneq ($(OS),Darwin)
|
|
@@ -313,10 +299,10 @@
|
|
$(MAKE) "CFLAGS+=$(DEBUG_UNIX_CFLAGS)" "LDFLAGS+=$(DEBUG_UNIX_LDFLAGS)" gmic_minimal
|
|
|
|
linux:
|
|
- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
|
|
+ $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic
|
|
|
|
custom:
|
|
- $(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
|
|
+ $(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic
|
|
|
|
solaris:
|
|
$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic
|
|
@@ -346,7 +332,6 @@
|
|
$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp -Dgmic_float_only
|
|
gmic_gimp : gmic_gimp.o gmic_gimp.cpp
|
|
$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS)
|
|
- strip gmic_gimp$(EXE)
|
|
|
|
gmic_minimal: gmic.cpp
|
|
$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS)
|
|
@@ -371,7 +356,6 @@
|
|
$(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double
|
|
gmic_gmic: gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o gmic_def.h
|
|
$(CC) -o gmic gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS)
|
|
- strip gmic$(EXE)
|
|
|
|
def:
|
|
@echo "#ifndef gmic_gimp" > gmic_def.h
|