瀏覽代碼

UI, obs-qsv11: Fix build in VisualStudio 2017

OBS did not build out of the box in VS2017 but it does with these
changes.

Closes jp9000/obs-studio#902
e00E 8 年之前
父節點
當前提交
4361c5bd45
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 3 3
      UI/win-update/win-update.cpp
  2. 1 0
      plugins/obs-qsv11/QSV_Encoder.cpp

+ 3 - 3
UI/win-update/win-update.cpp

@@ -658,11 +658,11 @@ try {
 	if (responseCode == 200) {
 		if (!QuickWriteFile(manifestPath, text.data(), text.size()))
 			throw strprintf("Could not write file '%s'",
-					manifestPath);
+					manifestPath.Get());
 	} else {
 		if (!QuickReadFile(manifestPath, text))
 			throw strprintf("Could not read file '%s'",
-					manifestPath);
+					manifestPath.Get());
 	}
 
 	/* ----------------------------------- *
@@ -764,7 +764,7 @@ try {
 		QString msg = QTStr("Updater.FailedToLaunch");
 		info(msg, msg);
 		throw strprintf("Can't launch updater '%s': %d",
-				updateFilePath, GetLastError());
+				updateFilePath.Get(), GetLastError());
 	}
 
 	/* force OBS to perform another update check immediately after updating

+ 1 - 0
plugins/obs-qsv11/QSV_Encoder.cpp

@@ -62,6 +62,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <obs-module.h>
 #include <string>
 #include <mutex>
+#include <intrin.h>
 
 #define do_log(level, format, ...) \
 	blog(level, "[qsv encoder: '%s'] " format, \