Started to merge @ZobyTwo cmake branch

2015-09-26 21:52:07 +02:00
parent 9e77899535
commit 85f4a4c36a
3112 changed files with 4615 additions and 9 deletions
--- a/JGE/src/JResourceManager.cpp
+++ b/JGE/src/JResourceManager.cpp
@@ -14,7 +14,7 @@
 #include "../include/JResourceManager.h"
 #include "../include/JFileSystem.h"
 #include "../include/JLBFont.h"
-#include "tinyxml/tinyxml.h"
+#include "tinyxml.h"

 #if defined (_DEBUG) && defined (WIN32) && (!defined LINUX)
 #include "crtdbg.h"