瀏覽代碼

ci(windows): this should work now

Stéphane Lepin 5 年之前
父節點
當前提交
9dfee38e44
共有 1 個文件被更改,包括 9 次插入4 次删除
  1. 9 4
      ci/windows/prepare-windows.cmd

+ 9 - 4
ci/windows/prepare-windows.cmd

@@ -1,9 +1,14 @@
-call "%~dp0..\ci_includes.generated.cmd"
+mkdir build32
+mkdir build64
 
 cd build32
 cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QTDIR32%" -DLibObs_DIR="%OBSPath%\build32\libobs" -DLIBOBS_INCLUDE_DIR="%OBSPath%\libobs" -DLIBOBS_LIB="%OBSPath%\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="%OBSPath%\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
-ren "%PluginName%.sln" "main.sln"
-
 cd ..\build64
 cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QTDIR64%" -DLibObs_DIR="%OBSPath%\build64\libobs" -DLIBOBS_INCLUDE_DIR="%OBSPath%\libobs" -DLIBOBS_LIB="%OBSPath%\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="%OBSPath%\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
-ren "%PluginName%.sln" "main.sln"
+
+REM Import the generated includes to get the plugin's name
+call "%~dp0..\ci_includes.generated.cmd"
+
+REM Rename the solution files to something CI can pick up 
+ren "build32\%PluginName%.sln" "main.sln"
+ren "build64\%PluginName%.sln" "main.sln"