Commits

Martín Lucas Golini committed b0f2bf1

Fixed issue #1.
Fixed OS X test linking problems.
Small fix in isAtLeastGL3.

Comments (0)

Files changed (2)

 		files { "src/test/*.cpp" }
 
 		configuration "windows"
-			links {"gdi32", "winmm", "user32","glfw","glu32", "opengl32"}
+			links {"gdi32","winmm","user32","glfw","glu32","opengl32"}
 
 		configuration "linux"
 			links {"GL","glfw"}
 		
 		configuration "macosx"
-			links {"GL","glfw"}
+			links {"OpenGL.framework","CoreFoundation.framework","glfw"}
 		
 		configuration "haiku"
 			links {"GL","glfw"}

src/SOIL2/SOIL2.c

 
 static int isAtLeastGL3()
 {
-	static int calc = 0;
-	static int is_gl3 = 0;
+	static int is_gl3 = SOIL_CAPABILITY_UNKNOWN;
 
-	if ( !calc )
+	if ( SOIL_CAPABILITY_UNKNOWN == is_gl3 )
 	{
 		const char * verstr	= (const char *) glGetString( GL_VERSION );
 		is_gl3				= ( verstr && ( atoi(verstr) >= 3 ) );