2008-01-05 12:39:27 +01:00
|
|
|
--- ./examples/Makefile.orig 2008-01-04 11:24:33.000000000 +0100
|
|
|
|
+++ ./examples/Makefile 2008-01-04 23:22:20.000000000 +0100
|
|
|
|
@@ -42,10 +42,10 @@
|
2004-10-20 22:54:08 +02:00
|
|
|
# Set correct variables and paths
|
2007-04-19 07:16:49 +02:00
|
|
|
#---------------------------------
|
2008-01-05 12:39:27 +01:00
|
|
|
CIMG_VERSION = 1.26
|
2007-04-19 07:16:49 +02:00
|
|
|
-CC = g++
|
|
|
|
-X11PATH = /usr/X11R6
|
|
|
|
-CFLAGS = -Wall -W -ansi -pedantic -ffast-math
|
|
|
|
-LDFLAGS = -lm -lpthread
|
|
|
|
+CC = $(CXX)
|
|
|
|
+#X11PATH = /usr/X11R6
|
|
|
|
+#CFLAGS = -Wall -W -ansi -pedantic -ffast-math
|
|
|
|
+#LDFLAGS = -lm -lpthread
|
|
|
|
|
|
|
|
#--------------------------------------------------
|
|
|
|
# Set compilation flags allowing to customize CImg
|
2008-01-05 12:39:27 +01:00
|
|
|
@@ -80,7 +80,7 @@
|
2007-12-11 22:13:09 +01:00
|
|
|
CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
|
|
|
|
|
|
|
|
# Flags to enable the use of LAPACK routines for matrix computation
|
|
|
|
-CIMG_LAPACK_FLAGS = -Dcimg_use_lapack -lblas -lg2c -llapack
|
|
|
|
+CIMG_LAPACK_FLAGS = -Dcimg_use_lapack -lblas -llapack
|
|
|
|
|
|
|
|
# Flags to enable the use of the Board library
|
|
|
|
CIMG_BOARD_FLAGS = -Dcimg_use_board -lboard
|
2008-01-05 12:39:27 +01:00
|
|
|
@@ -88,6 +88,9 @@
|
2007-04-19 07:16:49 +02:00
|
|
|
# Flags to compile on Solaris
|
|
|
|
CIMG_SOLARIS_FLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
|
|
|
|
|
|
|
|
+# Flags to compile on FreeBSD
|
|
|
|
+CIMG_FREEBSD_FLAGS = -ansi -ffast-math -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib
|
|
|
|
+
|
|
|
|
# Set default compilation flags.
|
|
|
|
# Uncomment lines here, if you want to customize your default configuration
|
|
|
|
CIMG_DEFAULT_FLAGS = $(CIMG_X11_FLAGS) \
|
2008-01-05 12:39:27 +01:00
|
|
|
@@ -144,7 +147,7 @@
|
2007-01-27 18:46:02 +01:00
|
|
|
all: $(CIMG_FILES)
|
2004-10-20 22:54:08 +02:00
|
|
|
|
|
|
|
clean:
|
2007-08-25 00:31:56 +02:00
|
|
|
- rm -f *.exe *~ jpeg_buffer greycstoration4gimp $(CIMG_FILES)
|
|
|
|
+ rm -f *.exe *~ jpeg_buffer greycstoration4gimp $(CIMG_FILES) Makefile.orig
|
2006-05-18 22:13:20 +02:00
|
|
|
|
2007-08-25 00:31:56 +02:00
|
|
|
greycstoration4gimp: greycstoration4gimp.cpp
|
|
|
|
@echo
|
2008-01-05 12:39:27 +01:00
|
|
|
@@ -164,6 +167,12 @@
|
2007-08-25 00:31:56 +02:00
|
|
|
Mlinux:
|
|
|
|
make "ARCHFLAGS=-O3 $(CIMG_ALL_FLAGS)" all jpeg_buffer greycstoration4gimp
|
2007-04-19 07:16:49 +02:00
|
|
|
|
|
|
|
+# FreeBSD targets
|
|
|
|
+dFreeBSD:
|
|
|
|
+ make "ARCHFLAGS=$(CIMG_FREEBSD_FLAGS) $(CIMG_DEFAULT_FLAGS)" all
|
|
|
|
+
|
|
|
|
+oFreeBSD:
|
|
|
|
+ make "ARCHFLAGS=$(CIMG_FREEBSD_FLAGS) $(CIMG_ALL_FLAGS)" all
|
2007-08-25 00:31:56 +02:00
|
|
|
# Sun Solaris targets
|
|
|
|
solaris:
|
|
|
|
make "ARCHFLAGS=$(CIMG_SOLARIS_FLAGS) $(CIMG_DEFAULT_FLAGS)" all
|