aboutsummaryrefslogtreecommitdiffstats
path: root/graphics/cimg/files/patch-examples::Makefile
blob: f745d27d3a82b5254621e5a77894e459fc7da66d (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  Wed Jul 19 09:41:26 2006
+++ examples/Makefile   Wed Jul 19 14:31:27 2006
@@ -7,10 +7,10 @@
 # -----------------------------------------------------------------------------------
 
 # Set correct variables and paths
-CC      = g++
-X11PATH = /usr/X11R6
-CFLAGS  = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
-LDFLAGS = -lm
+CC      = $(CXX)
+#X11PATH = /usr/X11R6
+#CFLAGS  = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
+#LDFLAGS = -lm
 CIMGVER = 1.15
 
 CIMGFILES = CImg_demo \
@@ -38,7 +38,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"
@@ -63,7 +63,7 @@
 all: $(CIMGFILES)
 
 clean:
-   rm -f *.exe *~ $(CIMGFILES)
+   rm -f *.exe *~ $(CIMGFILES) Makefile.orig
 
 # Linux/Mac OSX targets
 linux: