From 69e8d0e32f8a3051f8e3e780d64506af337f4b2c Mon Sep 17 00:00:00 2001
From: Bruno <bruno.herbelin@gmail.com>
Date: Tue, 25 Oct 2022 21:38:21 +0200
Subject: [PATCH] Compilation fix (OSX)

---
 CMakeLists.txt            | 1 +
 src/MultiFileRecorder.cpp | 2 +-
 src/RenderingManager.cpp  | 2 +-
 src/tinyxml2Toolkit.cpp   | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc8f28d..b8797b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -334,6 +334,7 @@ include_directories(
     ${IMGUITEXTEDIT_INCLUDE_DIR}
 )
 add_library(IMGUITEXTEDIT "${CMAKE_CURRENT_SOURCE_DIR}/ext/ImGuiColorTextEdit/TextEditor.cpp")
+set_property(TARGET IMGUITEXTEDIT PROPERTY CXX_STANDARD 17)
 message(STATUS "Compiling 'ImGuiColorTextEdit' from https://github.com/BalazsJako/ImGuiColorTextEdit -- ${IMGUITEXTEDIT_INCLUDE_DIR}")
 
 
diff --git a/src/MultiFileRecorder.cpp b/src/MultiFileRecorder.cpp
index 444c67a..5686a2f 100644
--- a/src/MultiFileRecorder.cpp
+++ b/src/MultiFileRecorder.cpp
@@ -336,7 +336,7 @@ std::string  MultiFileRecorder::assemble (MultiFileRecorder *rec)
     stbi_info( rec->files_.front().c_str(), &rec->width_, &rec->height_, &rec->bpp_);
 
     if ( rec->width_ < 10 || rec->height_ < 10 || rec->bpp_ < 3 ) {
-        Log::Warning("MultiFileRecorder: Invalid image %s.", rec->files_.front());
+        Log::Warning("MultiFileRecorder: Invalid image %s.", rec->files_.front().c_str());
         return filename;
     }
 
diff --git a/src/RenderingManager.cpp b/src/RenderingManager.cpp
index ec9f5c1..dee527d 100644
--- a/src/RenderingManager.cpp
+++ b/src/RenderingManager.cpp
@@ -31,7 +31,6 @@
 #include <GLFW/glfw3.h>
 
 #ifdef APPLE
-#include "osx/CocoaToolkit.h"
 #define GLFW_EXPOSE_NATIVE_COCOA
 #define GLFW_EXPOSE_NATIVE_NSGL
 #else
@@ -48,6 +47,7 @@
 #include <gst/gl/gstglcontext.h>
 
 #ifdef GLFW_EXPOSE_NATIVE_COCOA
+//#include "osx/CocoaToolkit.h"
 //#include <gst/gl/cocoa/gstgldisplay_cocoa.h>
 #endif
 #ifdef GLFW_EXPOSE_NATIVE_GLX
diff --git a/src/tinyxml2Toolkit.cpp b/src/tinyxml2Toolkit.cpp
index 632e102..0c91620 100644
--- a/src/tinyxml2Toolkit.cpp
+++ b/src/tinyxml2Toolkit.cpp
@@ -19,7 +19,6 @@
 
 #include <zlib.h>
 #include <glib.h>
-#include <glib/gi18n.h>
 
 #include <tinyxml2.h>
 #include "tinyxml2Toolkit.h"