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

OSX compilation fix

Browse Source
This commit is contained in:
brunoherbelin
2021-01-01 14:36:44 +01:00
parent cf2b6b4b39
commit a1e81b58b1
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -91,6 +91,11 @@ set(THREAD_LIBRARY Threads::Threads)
find_package(PNG REQUIRED)
set(PNG_LIBRARY PNG::PNG)
#set(ICU_ROOT "/usr/local/Cellar/icu4c/67.1")
find_package(ICU REQUIRED COMPONENTS i18n io uc)
macro_log_feature(ICU_FOUND "ICU" "International Components for Unicode" "http://site.icu-project.org" TRUE)
#
# GLFW3
# NB: set glfw3_PATH to /usr/local/Cellar/glfw/3.3.2/lib/cmake/glfw3
@@ -227,6 +232,7 @@ include_directories(
${STB_INCLUDE_DIR}
${DIRENT_INCLUDE_DIR}
${OSCPACK_INCLUDE_DIR}
${ICU_INCLUDE_DIRS}
)
@@ -397,7 +403,6 @@ IF(APPLE)
set(PLATFORM_LIBS
"-framework CoreFoundation"
"-framework Appkit"
"-licuio -licui18n -licuuc"
)
ELSE(APPLE)
@@ -407,7 +412,7 @@ ELSE(APPLE)
${IMGUITEXTEDIT_SRC}
)
set(PLATFORM_LIBS "-licuio -licui18n -licuuc"
set(PLATFORM_LIBS ""
)
ENDIF(APPLE)
@@ -446,6 +451,9 @@ target_link_libraries(${VMIX_BINARY} LINK_PRIVATE
IMGUI
OSCPACK
vmix::rc
ICU::i18n
ICU::io
ICU::uc
${PLATFORM_LIBS}
)

7
GstToolkit.cpp
View File

@@ -140,9 +140,12 @@ std::list<std::string> GstToolkit::enable_gpu_decoding_plugins()
const char *plugins[6] = { "nvh264dec", "nvh265dec", "nvmpeg2videodec",
"nvmpeg4videodec", "nvvp8dec", "nvvp9dec" };
const int N = 6;
#elif GST_GL_HAVE_PLATFORM_WGL
const char *plugins[1] = { "avdec_h264"};
#elif GST_GL_HAVE_PLATFORM_CGL
const char *plugins[1] = { "vtdec_hw" };
const int N = 1;
#else
const char *plugins[0] = { };
const int N = 0;
#endif
for (int i = 0; i < N; i++) {

4
Source.cpp
View File

@@ -249,8 +249,8 @@ void Source::setName (const std::string &name)
{
name_ = SystemToolkit::transliterate(name);
initials_[0] = std::toupper( name_.front(), std::locale("en_US.utf8") );
initials_[1] = std::toupper( name_.back(), std::locale("en_US.utf8") );
initials_[0] = std::toupper( name_.front(), std::locale("C") );
initials_[1] = std::toupper( name_.back(), std::locale("C") );
}
void Source::accept(Visitor& v)

5
UserInterfaceManager.cpp
View File

@@ -2897,7 +2897,8 @@ void ShowConfig(bool* p_open)
ImGuiToolkit::IconToggle(10,0,11,0,&show_config);
if (show_config)
{
ImGui::Text("\nOpenGL options (enable all for optimal performance).");
ImGui::Text("\nPerformance options\n(enable all for optimal performance, disable for low hardware support).");
ImGui::Spacing();
ImGui::Checkbox("Blit framebuffer (fast draw to output)", &Settings::application.render.blit);
bool multi = (Settings::application.render.multisampling > 0);
ImGui::Checkbox("Antialiasing framebuffer (fast multisampling)", &multi);
@@ -2905,7 +2906,7 @@ void ShowConfig(bool* p_open)
bool vsync = (Settings::application.render.vsync < 2);
ImGui::Checkbox("Sync refresh with monitor (v-sync 60Hz)", &vsync);
Settings::application.render.vsync = vsync ? 1 : 2;
ImGui::Checkbox("Use GPU video decoding when possible", &Settings::application.render.gpu_decoding);
ImGui::Checkbox("Hardware video decoding (try if applicable)", &Settings::application.render.gpu_decoding);
ImGui::Spacing();
ImGui::Text( ICON_FA_EXCLAMATION " Restart the application for change to take effect.");
if (ImGui::Button( ICON_FA_POWER_OFF " Quit ", ImVec2(250,0)))