fixed incorrect checking of the existence of GLX_EXT_swap_control and friends

[demo_prior] / Makefile

diff --git a/Makefile b/Makefile
index 7669326..5bcb73e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-src = $(wildcard src/*.c)
+src = $(wildcard src/*.c) $(wildcard src/imtk/*.c)
 obj = $(src:.c=.o)
 dep = $(src:.c=.d)
 bin = demo
@@ -6,11 +6,13 @@ bin = demo
 warn = -pedantic -Wall -g
 def = -DMINIGLUT_USE_LIBC
 
-incpath = -Ilibs/glew -Ilibs/treestore/src -Ilibs/cgmath
-libpath = -Llibs/glew -Llibs/treestore
+incpath = -Isrc -Isrc/imtk -Ilibs/cgmath -Ilibs/glew -Ilibs/treestore/src \
+                 -Ilibs/imago2/src -Ilibs/drawtext/src
+libpath = -Llibs/glew -Llibs/treestore -Llibs/imago2 -Llibs/drawtext
 
 CFLAGS = $(warn) $(def) $(incpath) -MMD
-LDFLAGS = $(libpath) -lX11 -lXext -lGL -lGLU -lglut -lglew_static -ltreestore -lm
+LDFLAGS = $(libpath) -ltreestore -limago -lpng -lz -ljpeg -ldrawtext \
+                 -lglew_static -lGL -lGLU -lglut -lX11 -lXext -lm
 
 $(bin): $(obj) libs
        $(CC) -o $@ $(obj) $(LDFLAGS)