Some linux fixes

Author: Borf

blib.pro

@@ -9,7 +9,7 @@ CONFIG -= unicode
 
 unix {
     CONFIG += object_with_source
-    CONFIG += object_parallel_to_source
+ #   CONFIG += object_parallel_to_source
 }
 
 DEFINES -= UNICODE
@@ -24,7 +24,7 @@ windows {
 #QMAKE_EXT_CPP += .c
 QMAKE_CXXFLAGS += -Wall -std=c++11
 CONFIG += object_with_source
-CONFIG += object_parallel_to_source
+#CONFIG += object_parallel_to_source
 
 SOURCES += \
     blib/Animation.cpp \
@@ -307,6 +307,6 @@ unix {
 }
 
 windows {
-    SOURCES += blib/platform/win32/window.cpp
-    SOURCES += blib/platform/win32/Registry.cpp
+    SOURCES +=
+    SOURCES +=
 }

blib/StaticModel.cpp

@@ -26,7 +26,7 @@ namespace blib
 
 	static void loadChildren(blib::StaticModel::Bone* bone, const blib::json::Value &json)
 	{
-		bone->name = json["name"];
+        bone->name = json["name"].asString();
 		bone->matrix = jsonToMatrix(json["matrix"]);
 		if (!json.isMember("children"))
 			return;

blib/gl/Renderer.cpp

@@ -62,13 +62,14 @@ namespace blib
 				Render* r = toRender[1-activeLayer][i];
 				if(r->command == Render::Clear)
 				{
-					if(r->renderState.activeFbo == NULL)
+#ifdef WIN32
+                    if(r->renderState.activeFbo == NULL)
 						glBindFramebuffer(GL_FRAMEBUFFER, oldFbo);
 					else
 					{
 						r->renderState.activeFbo->bind();
-					}
-
+                    }
+#endif
 					glDisable(GL_SCISSOR_TEST);
 					glClearStencil(0);
 					glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
@@ -160,12 +161,14 @@ namespace blib
                             glDisable(GL_DEPTH_TEST);
                     }
 
+#ifdef WIN32
                     if (!lastRenderState || lastRenderState->activeFbo != r->renderState.activeFbo) {
 						if(r->renderState.activeFbo == NULL)
 							glBindFramebuffer(GL_FRAMEBUFFER, oldFbo);
 						else
                             r->renderState.activeFbo->bind();
                     }
+#endif
 
                     if (!lastRenderState || lastRenderState->stencilTestEnabled != r->renderState.stencilTestEnabled || lastRenderState->stencilWrite != r->renderState.stencilWrite) {
 						if(r->renderState.stencilTestEnabled)
@@ -319,7 +322,9 @@ namespace blib
 			//delete takes up a lot of time here, let's see if we can reuse the list of vertices
 
 			clearCommands();
-            glBindFramebuffer(GL_FRAMEBUFFER, oldFbo);
+#ifdef WIN32
+//TODO            glBindFramebuffer(GL_FRAMEBUFFER, oldFbo);
+#endif
 		}
 
 	}

blib/platform/linux/window.cpp

@@ -83,10 +83,8 @@ namespace blib
 
 			void Window::tick()
 			{
-				Log::out<<"WindowTick - Top!"<<Log::newline;
 				while(XPending(dpy) > 0)
 				{
-					Log::out<<"WindowTick while XPending!"<<Log::newline;
 					XNextEvent(dpy, &xev);
 
 					if(xev.type == Expose)
@@ -95,7 +93,7 @@ namespace blib
 					}
 					if(xev.type == KeyPress)
 					{
-						//exit(0);
+                        exit(0);
 					}
 				}
 			}

blib/util/Log.cpp

@@ -142,7 +142,8 @@ namespace blib
 		#ifdef ANDROID
 			LOGI("%s", buffer.c_str());
 		#else
-			printf("%s\n", buffer.c_str());
+            printf("%s\n", buffer.c_str());
+            fflush(stdout);
 		#endif
 			buffer = "";
 #ifdef WIN32