eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-15 12:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compilation fix (OSX)

Browse Source
This commit is contained in:
Bruno
2022-10-25 21:38:21 +02:00
parent 830d1a6bf9
commit 69e8d0e32f
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -334,6 +334,7 @@ include_directories(
${IMGUITEXTEDIT_INCLUDE_DIR} ${IMGUITEXTEDIT_INCLUDE_DIR}
) )
add_library(IMGUITEXTEDIT "${CMAKE_CURRENT_SOURCE_DIR}/ext/ImGuiColorTextEdit/TextEditor.cpp") 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}") message(STATUS "Compiling 'ImGuiColorTextEdit' from https://github.com/BalazsJako/ImGuiColorTextEdit -- ${IMGUITEXTEDIT_INCLUDE_DIR}")

2
src/MultiFileRecorder.cpp
View File

@@ -336,7 +336,7 @@ std::string MultiFileRecorder::assemble (MultiFileRecorder *rec)
stbi_info( rec->files_.front().c_str(), &rec->width_, &rec->height_, &rec->bpp_); stbi_info( rec->files_.front().c_str(), &rec->width_, &rec->height_, &rec->bpp_);
if ( rec->width_ < 10 || rec->height_ < 10 || rec->bpp_ < 3 ) { 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; return filename;
} }

2
src/RenderingManager.cpp
View File

@@ -31,7 +31,6 @@
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#ifdef APPLE #ifdef APPLE
#include "osx/CocoaToolkit.h"
#define GLFW_EXPOSE_NATIVE_COCOA #define GLFW_EXPOSE_NATIVE_COCOA
#define GLFW_EXPOSE_NATIVE_NSGL #define GLFW_EXPOSE_NATIVE_NSGL
#else #else
@@ -48,6 +47,7 @@
#include <gst/gl/gstglcontext.h> #include <gst/gl/gstglcontext.h>
#ifdef GLFW_EXPOSE_NATIVE_COCOA #ifdef GLFW_EXPOSE_NATIVE_COCOA
//#include "osx/CocoaToolkit.h"
//#include <gst/gl/cocoa/gstgldisplay_cocoa.h> //#include <gst/gl/cocoa/gstgldisplay_cocoa.h>
#endif #endif
#ifdef GLFW_EXPOSE_NATIVE_GLX #ifdef GLFW_EXPOSE_NATIVE_GLX

1
src/tinyxml2Toolkit.cpp
View File

@@ -19,7 +19,6 @@
#include <zlib.h> #include <zlib.h>
#include <glib.h> #include <glib.h>
#include <glib/gi18n.h>
#include <tinyxml2.h> #include <tinyxml2.h>
#include "tinyxml2Toolkit.h" #include "tinyxml2Toolkit.h"