Commits

Jason McKesson committed d8c8047 Merge

Merge

Comments (0)

Files changed (3)

 
 #include <glload/gl_3_3_comp.h>
 #include <GL/freeglut.h>
+#include <framework.h>
 
 
 //Called after the window and OpenGL are initialized. Called exactly once, before the main loop.
 void init()
 {
-
 }
 
 //Called to update the display.

framework/framework.cpp

 
 	if(glext_ARB_debug_output)
 	{
-//		printf("Debug output.");
 		glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
 		glDebugMessageCallbackARB(DebugFunc, (void*)15);
 	}
 	glutReshapeFunc(reshape);
 	glutKeyboardFunc(keyboard);
 	glutMainLoop();
-	printf("here!\n");
 	return 0;
 }

framework/framework.lua

 
 		UseLibs {"glload", "glimage", "glm", "freeglut"}
 
-		includedirs {"../tinyxml"}
+		includedirs {"../tinyxml", "../framework"}
 			
 		links "framework"
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.