浏览代码

Merge pull request #1186 from jp9000/macextras

UI: Add deps to fix vst UI
Colin Edwards 7 年之前
父节点
当前提交
07599292bd
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 6 0
      UI/CMakeLists.txt
  2. 1 1
      plugins/obs-vst

+ 6 - 0
UI/CMakeLists.txt

@@ -37,6 +37,10 @@ endif()
 find_package(Qt5Widgets ${FIND_MODE})
 find_package(Qt5Widgets ${FIND_MODE})
 find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil avformat)
 find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil avformat)
 
 
+if(APPLE)
+	find_package(Qt5MacExtras REQUIRED)
+endif(APPLE)
+
 if(NOT Qt5Widgets_FOUND)
 if(NOT Qt5Widgets_FOUND)
 	if (ENABLE_UI)
 	if (ENABLE_UI)
 		message(FATAL_ERROR "Failed to find Qt5")
 		message(FATAL_ERROR "Failed to find Qt5")
@@ -271,6 +275,8 @@ target_link_libraries(obs
 	${obs_PLATFORM_LIBRARIES})
 	${obs_PLATFORM_LIBRARIES})
 
 
 if (APPLE)
 if (APPLE)
+	target_link_libraries(obs
+			Qt5::MacExtras)
 	set_target_properties(obs PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
 	set_target_properties(obs PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
 	set_property(
 	set_property(
 		TARGET obs
 		TARGET obs

+ 1 - 1
plugins/obs-vst

@@ -1 +1 @@
-Subproject commit a07f7398be8264a420c84ebae3f3712027a502b7
+Subproject commit b0f046f0ac0c8181d018f7148c7617b577a1e085