Index: trunk/src/lua/lua_glm.cc
===================================================================
--- trunk/src/lua/lua_glm.cc	(revision 395)
+++ trunk/src/lua/lua_glm.cc	(revision 397)
@@ -56,5 +56,5 @@
 	static inline T unit() { return T( 1, 1, 1 ); }
 	static inline T construct( lua_State* L, int index ) {
-		typedef glm::detail::tvec2<typename T::value_type> vec2;
+		typedef nv::tvec2<typename T::value_type> vec2;
 		if ( lua_type( L, index ) == LUA_TUSERDATA )
 		{
@@ -77,6 +77,6 @@
 	static inline T unit() { return T( 1, 1, 1, 1 ); }
 	static inline T construct( lua_State* L, int index ) {
-		typedef glm::detail::tvec2<typename T::value_type> vec2;
-		typedef glm::detail::tvec3<typename T::value_type> vec3;
+		typedef nv::tvec2<typename T::value_type> vec2;
+		typedef nv::tvec3<typename T::value_type> vec3;
 		if ( lua_type( L, index ) == LUA_TUSERDATA )
 		{
@@ -214,5 +214,5 @@
 {
 	T v = to_vec<T>( L, 1 );
-	for ( size_t i = 0; i < v.length(); ++i )
+	for ( int i = 0; i < v.length(); ++i )
 	{
 		lua_pushnumber( L, v[i] );
@@ -242,7 +242,7 @@
 	{
 		switch (len) {
-		case 2 : push_vec( L, glm::detail::tvec2<typename T::value_type>( (*v)[nlua_swizzel_lookup[key[0]]], (*v)[nlua_swizzel_lookup[key[1]]] ) ); return 1;
-		case 3 : push_vec( L, glm::detail::tvec3<typename T::value_type>( (*v)[nlua_swizzel_lookup[key[0]]], (*v)[nlua_swizzel_lookup[key[1]]], (*v)[nlua_swizzel_lookup[key[2]]] ) ); return 1;
-		case 4 : push_vec( L, glm::detail::tvec4<typename T::value_type>( (*v)[nlua_swizzel_lookup[key[0]]], (*v)[nlua_swizzel_lookup[key[1]]], (*v)[nlua_swizzel_lookup[key[2]]], (*v)[nlua_swizzel_lookup[key[3]]] ) ); return 1;
+		case 2 : push_vec( L, nv::tvec2<typename T::value_type>( (*v)[nlua_swizzel_lookup[key[0]]], (*v)[nlua_swizzel_lookup[key[1]]] ) ); return 1;
+		case 3 : push_vec( L, nv::tvec3<typename T::value_type>( (*v)[nlua_swizzel_lookup[key[0]]], (*v)[nlua_swizzel_lookup[key[1]]], (*v)[nlua_swizzel_lookup[key[2]]] ) ); return 1;
+		case 4 : push_vec( L, nv::tvec4<typename T::value_type>( (*v)[nlua_swizzel_lookup[key[0]]], (*v)[nlua_swizzel_lookup[key[1]]], (*v)[nlua_swizzel_lookup[key[2]]], (*v)[nlua_swizzel_lookup[key[3]]] ) ); return 1;
 		default: break;
 		}
@@ -258,7 +258,7 @@
 int nlua_vec_newindex( lua_State* L )
 {
-	typedef glm::detail::tvec2<typename T::value_type> vec2;
-	typedef glm::detail::tvec3<typename T::value_type> vec3;
-	typedef glm::detail::tvec4<typename T::value_type> vec4;
+	typedef nv::tvec2<typename T::value_type> vec2;
+	typedef nv::tvec3<typename T::value_type> vec3;
+	typedef nv::tvec4<typename T::value_type> vec4;
 
 	T* v = to_pvec<T>( L, 1 );