diff --git a/modules/sl/source/SL.h b/modules/sl/source/SL.h index 8165192f..48708e1a 100644 --- a/modules/sl/source/SL.h +++ b/modules/sl/source/SL.h @@ -235,7 +235,7 @@ SL_sizeOfVector(const T& vector) //----------------------------------------------------------------------------- // Some debugging and error handling macros #define SL_LOG(...) Utils::log("SLProject", __VA_ARGS__) -#define SL_EXIT_MSG(message) Utils::log("SLProject Error", (message)) +#define SL_EXIT_MSG(message) Utils::exitMsg("SLProject", (message), __LINE__, __FILE__) #define SL_WARN_MSG(message) Utils::warnMsg("SLProject", (message), __LINE__, __FILE__) //----------------------------------------------------------------------------- #endif diff --git a/modules/sl/source/gl/SLGLShader.cpp b/modules/sl/source/gl/SLGLShader.cpp index eaa87438..7602a311 100644 --- a/modules/sl/source/gl/SLGLShader.cpp +++ b/modules/sl/source/gl/SLGLShader.cpp @@ -149,6 +149,7 @@ SLbool SLGLShader::createAndCompile(SLVLight* lights) SLint lineNum = 1; for (string& line : lines) SL_LOG("%4d: %s", lineNum++, line.c_str()); + SL_LOG("\n"); return false; } diff --git a/modules/utils/source/Utils.cpp b/modules/utils/source/Utils.cpp index 80889202..2f06388b 100644 --- a/modules/utils/source/Utils.cpp +++ b/modules/utils/source/Utils.cpp @@ -201,10 +201,10 @@ vector getStringLines(const string& multiLineString) { std::string line; std::getline(stream, line); - if (!stream.good()) - break; line = Utils::trimString(line, "\r"); res.push_back(line); + if (!stream.good()) + break; } return res; } @@ -1391,7 +1391,7 @@ std::string ComputerInfos::get() // model = model; # endif -#elif defined(ANDROID) //................................................ +#elif defined(ANDROID) //................................................ os = "Android";