[luabind-cvs] luabind/luabind/examples/glut Jamfile,1.1,1.2 glut_bind.cpp,1.4,1.5 makefile,1.5,1.6

[Arvid N. <ar...@us...>]

Update of /cvsroot/luabind/luabind/luabind/examples/glut
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15879/luabind/examples/glut

Modified Files:
	glut_bind.cpp makefile 
Added Files:
	Jamfile 
Log Message:
merged in changes from beta7-devel2 (tag: beta7-devel2-merge)

Index: glut_bind.cpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/examples/glut/glut_bind.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- glut_bind.cpp	7 Aug 2004 13:37:10 -0000	1.4
+++ glut_bind.cpp	28 Nov 2005 20:55:34 -0000	1.5
@@ -8,7 +8,7 @@
 #include <luabind/luabind.hpp>
 #include <luabind/class.hpp>
 #include <luabind/function.hpp>
-#include <luabind/functor.hpp>
+#include <luabind/object.hpp>
 
 
 #include <GL/glut.h>
@@ -18,68 +18,70 @@
 struct glut_constants {};
 struct gl_constants {};
 
+using luabind::object;
+
 namespace glut_bindings
 {
-	luabind::functor<void> displayfunc;
+	object displayfunc;
 
 	void displayfunc_callback()
 	{
 		displayfunc();
 	}
 
-	void set_displayfunc(const luabind::functor<void>& fun)
+	void set_displayfunc(object const& fun)
 	{
 		glutDisplayFunc(&displayfunc_callback);
 		displayfunc = fun;
 	}
 
-	luabind::functor<void> idlefunc;
+	object idlefunc;
 
 	void idlefunc_callback()
 	{
 		idlefunc();
 	}
 
-	void set_idlefunc(const luabind::functor<void>& fun)
+	void set_idlefunc(object const& fun)
 	{
 		glutIdleFunc(&idlefunc_callback);
 		idlefunc = fun;
 	}
 
 
-	luabind::functor<void> reshapefunc;
+	object reshapefunc;
 
 	void reshapefunc_callback(int w, int h)
 	{
-		reshapefunc(w,h);
+		reshapefunc(w, h);
 	}
 
-	void set_reshapefunc(const luabind::functor<void>& fun)
+	void set_reshapefunc(object const& fun)
 	{
 		reshapefunc = fun;
 	}
 
-	luabind::functor<void> keyboardfunc;
+	object keyboardfunc;
 
 	void keyboardfunc_callback(unsigned char key, int x, int y)
 	{
-		keyboardfunc(key,x,y);
+		keyboardfunc(key, x, y);
 	}
 
-	void set_keyboardfunc(const luabind::functor<void>& fun)
+	void set_keyboardfunc(object const& fun)
 	{
 		glutKeyboardFunc(&keyboardfunc_callback);
 		keyboardfunc = fun;
 	}
 
-	luabind::functor<void> mousefunc;
+	object mousefunc;
 
 	void mousefunc_callback(int button, int state, int x, int y)
 	{
 		mousefunc(button, state, x, y);
 	}
 
-	void set_mousefunc(const luabind::functor<void>& fun)
+	void set_mousefunc(object const& fun)
 	{
 		mousefunc = fun;
 	}
@@ -137,7 +139,7 @@
 			.enum_("constants")
 			[
 				value("COLOR_BUFFER_BIT", GL_COLOR_BUFFER_BIT),
-					value("DEPTH_BUFFER_BIT", GL_DEPTH_BUFFER_BIT),
+				value("DEPTH_BUFFER_BIT", GL_DEPTH_BUFFER_BIT),
 				value("TRIANGLES", GL_TRIANGLES),
 				value("MODELVIEW", GL_MODELVIEW),
 				value("PROJECTION", GL_PROJECTION)
@@ -163,17 +165,13 @@
 	];
 }
 
-int main()
+int main(int argc, char* argv[])
 {
 	lua_State* L = lua_open();
 	lua_baselibopen(L);
 	lua_mathlibopen(L);
 	bind_glut(L);
 
-	int argc = 1;
-	char* argv[1];
-	argv[0] = "blabla";
-
 	glutInit (&argc, argv);
 
 	lua_dofile(L, "glut_bindings.lua");

Index: makefile
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/examples/glut/makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- makefile	4 Apr 2004 16:14:09 -0000	1.5
+++ makefile	28 Nov 2005 20:55:34 -0000	1.6
@@ -2,8 +2,14 @@
 
 all: glut_test
 
+# if using fink on darwin
+# you need these additional flags
+CPPFLAGS = -I/sw/include -L/sw/lib
+
 glut_test: glut_bind.cpp
-	$(CXX) glut_bind.cpp -o glut_bind -I$(LUA_PATH)/include -I- -I$(BOOST_ROOT) -I../../ -I/usr/X11R6/include -L/usr/X11R6/lib -L$(LUA_PATH)/lib -L../../lib -lluabind -lX11 -lXi -lXmu -lglut -lGL -lGLU -lm -llua -llualib
+	$(CXX) glut_bind.cpp -o glut_bind -I$(LUA_PATH)/include -I- -I$(BOOST_ROOT) $(CPPFLAGS) \
+	-I../../ -I/usr/X11R6/include -L/usr/X11R6/lib -L$(LUA_PATH)/lib -L../../lib \
+	-lluabind -lX11 -lXi -lXmu -lglut -lGL -lGLU -lm -llua -llualib
 
 clean:
 	rm -f glut_bind.o

--- NEW FILE: Jamfile ---
import modules ;

lib glut : : <name>glut ;
lib glu : : <name>glu ;
lib gl : : <name>gl ;

exe glut_bind
    : glut_bind.cpp gl glu glut
      /luabind//lualib
      /luabind//luabind
    ;

stage . : glut_bind ;