blob: 9623d5f9623f27a3cb15ec74d507834fe4c52188 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
--- examples/Makefile.orig Mon Nov 6 15:26:08 2006
+++ examples/Makefile Mon Nov 6 16:16:00 2006
@@ -8,10 +8,10 @@
# Set correct variables and paths
CIMGVER = 1.17
-CC = g++
-X11PATH = /usr/X11R6
-CFLAGS = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
-LDFLAGS = -L$(X11PATH)/lib -lm -lpthread -lX11
+CC = $(CXX)
+#X11PATH = /usr/X11R6
+#CFLAGS = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
+#LDFLAGS = -L$(X11PATH)/lib -lm -lpthread -lX11
# Uncomment to enable fast image display, using the XSHM library.
XSHM_FLAGS = -Dcimg_use_xshm -lXext
@@ -59,7 +59,7 @@
@echo
@echo "** Compiling '$* ($(CIMGVER))' with '`$(CC) -v 2>&1 | grep version`'"
@echo
- $(CC) -o $* $< $(CFLAGS) $(LDFLAGS) $(ARCHFLAGS)
+ $(CC) -o $* $< $(CPPFLAGS) -Wall -ansi -pedantic -ffast-math -I$(X11PATH)/include -lX11 -L$(X11PATH)/lib $(LDFLAGS)
menu:
@echo
@echo "CImg Library $(CIMGVER) : Examples"
@@ -84,7 +84,7 @@
all: $(CIMGFILES)
clean:
- rm -f *.exe *~ $(CIMGFILES)
+ rm -f *.exe *~ $(CIMGFILES) Makefile.orig
# Linux/Mac OSX targets
linux:
|
