# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1319575119 -10800
# Node ID dedd153d2ceb7e389ae3b549bf94ff1d175ec120
# Parent  2c575855f70783a15bde3f147fee9f88e8d0c2b0
- fixed makefile to produce non-broken shared objects
- removed glutGetModifiers from the motion callback and placed it in the mouse
  callback as apparently it's not supposed to be called from there.
- added MacOSX include paths in the examples

diff -r 2c575855f707 -r dedd153d2ceb Makefile.in
--- a/Makefile.in	Tue Oct 25 23:21:32 2011 +0300
+++ b/Makefile.in	Tue Oct 25 23:38:39 2011 +0300
@@ -28,7 +28,7 @@
 all: $(lib_so) $(lib_a)
 
 $(lib_so): $(obj)
-	$(CC) -o $@ $(shared) $(LDFLAGS)
+	$(CC) -o $@ $(shared) $(obj) $(LDFLAGS)
 
 $(lib_a): $(obj)
 	$(AR) rcs $@ $(obj)
diff -r 2c575855f707 -r dedd153d2ceb examples/metaballs/Makefile
--- a/examples/metaballs/Makefile	Tue Oct 25 23:21:32 2011 +0300
+++ b/examples/metaballs/Makefile	Tue Oct 25 23:38:39 2011 +0300
@@ -7,11 +7,12 @@
 #nosdr = -DNO_SHADERS
 
 CC = gcc
-CFLAGS = -pedantic -Wall -g -I../../src $(nosdr)
+CFLAGS = -pedantic -Wall -g -I../../src $(inc) $(nosdr)
 LDFLAGS = -L../.. -lmetasurf $(libgl)
 
 ifeq ($(shell uname -s), Darwin)
-	libgl = -framework OpenGL -framework GLUT -lGLEW
+	inc = -I/opt/local/include
+	libgl = -L/opt/local/lib -framework OpenGL -framework GLUT -lGLEW
 else
 	libgl = -lGL -lGLU -lglut -lGLEW
 endif
diff -r 2c575855f707 -r dedd153d2ceb examples/metaballs/src/metaballs.c
--- a/examples/metaballs/src/metaballs.c	Tue Oct 25 23:21:32 2011 +0300
+++ b/examples/metaballs/src/metaballs.c	Tue Oct 25 23:38:39 2011 +0300
@@ -262,12 +262,14 @@
 
 int bnstate[32];
 int prev_x, prev_y;
+int mod;
 
 void mouse(int bn, int state, int x, int y)
 {
 	bnstate[bn] = state == GLUT_DOWN;
 	prev_x = x;
 	prev_y = y;
+	mod = glutGetModifiers();
 }
 
 void motion(int x, int y)
@@ -279,7 +281,7 @@
 	prev_x = x;
 	prev_y = y;
 
-	if(glutGetModifiers()) {
+	if(mod) {
 		if(bnstate[GLUT_LEFT_BUTTON]) {
 			cam_inp_rotate(dx, dy);
 		}
diff -r 2c575855f707 -r dedd153d2ceb examples/volume/Makefile
--- a/examples/volume/Makefile	Tue Oct 25 23:21:32 2011 +0300
+++ b/examples/volume/Makefile	Tue Oct 25 23:38:39 2011 +0300
@@ -7,11 +7,12 @@
 #nosdr = -DNO_SHADERS
 
 CC = gcc
-CFLAGS = -pedantic -Wall -g -I../../src $(nosdr)
+CFLAGS = -pedantic -Wall -g -I../../src $(inc) $(nosdr)
 LDFLAGS = -L../.. -lmetasurf $(libgl) -limago
 
 ifeq ($(shell uname -s), Darwin)
-	libgl = -framework OpenGL -framework GLUT -lGLEW
+	inc = -I/opt/local/include
+	libgl = -L/opt/local/lib -framework OpenGL -framework GLUT -lGLEW
 else
 	libgl = -lGL -lGLU -lglut -lGLEW
 endif