changes to build and run on arch

.gitignore

@@ -5,3 +5,4 @@ Icon
 
 build*
 .idea
+.directory

CMakeLists.txt

@@ -52,7 +52,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 endif()
 
 # Flags for all builds
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} ${WARNINGS}")
+set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} ${WARNINGS} -DGLM_ENABLE_EXPERIMENTAL")
 
 # Flags for Debug build
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")

include/Log.h

@@ -65,7 +65,7 @@ class LogLevel {
     template<typename T>
     LogLevel& operator<< (const T t) {
         printBuffer << t;
-        if (printBuffer.str().back() == Log::endl) {
+        if ((printBuffer.str().length() > 0) && (printBuffer.str().back() == Log::endl)) {
             std::string s = printBuffer.str().substr(0, printBuffer.str().length() - 1);
             printBuffer.str("");
             Log::wholeLog.emplace_back(s, level);

src/CMakeLists.txt

@@ -14,6 +14,7 @@ include_directories (SYSTEM  ${GLM_INCLUDE_DIRS})
 # Add glbinding Library
 find_package (glbinding REQUIRED)
 include_directories (SYSTEM ${GLBINDING_INCLUDES})
+# TODO REQUIRED has no effect and GLBINDING_LIBRARIES is empty?!
 set (GLBINDING_LIBRARIES "glbinding::glbinding")
 set (LIBS ${LIBS} ${GLBINDING_LIBRARIES})
 

src/main.cpp

@@ -27,14 +27,15 @@
 #include <glbinding/Binding.h>
 #include <ezoptionparser/ezOptionParser.hpp>
 
-#ifdef DEBUG_GLBINDINGS
-#include <glbinding/callbacks.h>
+// TODO broken
+#ifdef ENABLE_GL_DEBUGGING
+#include <glbinding/CallbackMask.h>
 #include <glbinding/Meta.h>
-#endif
+#endif // ENABLE_GL_DEBUGGING
 
 static std::string configFileToUse;
 
-#ifdef DEBUG_GLBINDINGS
+#ifdef ENABLE_GL_DEBUGGING
 static void glErrorCallback(const glbinding::FunctionCall& call) {
     RunTime::incrementCallCount();
 
@@ -73,7 +74,7 @@ static void glUnresolvedCallback(const glbinding::AbstractFunction& func) {
     Log::get(LOG_ERROR) << "Unresolved OpenGL call: \"" << func.name() << "\"!" << Log::endl;
     orAssert(func.isResolved());
 }
-#endif
+#endif // ENABLE_GL_DEBUGGING
 
 int main(int argc, const char* argv[]) {
     ez::ezOptionParser opt;
@@ -121,19 +122,19 @@ int main(int argc, const char* argv[]) {
         opt.get("-c")->getString(configFileToUse);
     }
 
-    glbinding::Binding::initialize();
+    glbinding::Binding::initialize(nullptr);
     Log::initialize();
     RunTime::initialize(); // RunTime is required by other constructors
     Command::fillCommandList();
 
-#ifdef DEBUG_GLBINDINGS
+#ifdef ENABLE_GL_DEBUGGING
     // Register global OpenGL after-callback for all GL functions except glGetError
     glbinding::setCallbackMaskExcept(glbinding::CallbackMask::After
                                      | glbinding::CallbackMask::ParametersAndReturnValue,
     { "glGetError" });
     glbinding::setAfterCallback(glErrorCallback);
     glbinding::setUnresolvedCallback(glUnresolvedCallback);
-#endif
+#endif // ENABLE_GL_DEBUGGING
 
     Log::get(LOG_INFO) << "Initializing " << VERSION << Log::endl;