X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg.h;h=9ff59ddd2fa741b4fb9102f578598f8ffc5fbead;hb=ab7f9c0826344344193502caaaa72c4abe48248c;hp=b35091b5aa5e2779e39c64ccf76bdad1dee225ee;hpb=bd3188f0fe52c9231f79af85d6cfaef2576b9f83;p=fishladder.git

diff --git a/vg/vg.h b/vg/vg.h
index b35091b..9ff59dd 100644
--- a/vg/vg.h
+++ b/vg/vg.h
@@ -24,6 +24,9 @@ m3x3f vg_pv;
 
 #include "vg/vg_m.h"
 #include "vg/vg_io.h"
+
+#ifndef VG_TOOLS
+
 #include "vg/vg_audio.h"
 #include "vg/vg_shader.h"
 #include "vg/vg_lines.h"
@@ -132,7 +135,7 @@ static inline int vg_get_button_up( const char *button )
 
 static inline int key_is_keyboard( int const id )
 {
-	static_assert( GLFW_MOUSE_BUTTON_LAST < GLFW_KEY_SPACE, "GLFW: Mouse has too many buttons" );
+	vg_static_assert( GLFW_MOUSE_BUTTON_LAST < GLFW_KEY_SPACE, "GLFW: Mouse has too many buttons" );
 	return id > GLFW_MOUSE_BUTTON_LAST;
 }
 
@@ -284,7 +287,7 @@ static void vg_init( int argc, char *argv[], const char *window_name )
 	glfwWindowHint( GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE );
 	glfwWindowHint( GLFW_OPENGL_DEBUG_CONTEXT, GL_TRUE );
 	
-	glfwWindowHint( GLFW_SAMPLES, 1 );
+	glfwWindowHint( GLFW_SAMPLES, 4 );
 	
 	GLFWmonitor *monitor_primary = glfwGetPrimaryMonitor();
 	
@@ -334,7 +337,7 @@ static void vg_init( int argc, char *argv[], const char *window_name )
 			vg_gamepad_ready = 1;
 			vg_gamepad_id = id;
 			
-			return;
+			break;
 		}
 	}
 	
@@ -398,5 +401,7 @@ void vg_projection_update(void)
 	m3x3_mulv( inverse, vg_mouse_ws, vg_mouse_ws );
 }
 
+#endif
+
 u32 NvOptimusEnablement = 0x00000001;
 int AmdPowerXpressRequestHighPerformance = 1;