Skip to content
This repository was archived by the owner on Jul 21, 2020. It is now read-only.

Commit d6135c9

Browse files
committed
build in obs not working, disabling
1 parent 9da003e commit d6135c9

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

build_script/build.bat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ SET obs_version=17.0.2-ftl.29
44
SET coredeps=C:\beam\tachyon_deps
55
SET QTDIR64=C:\Qt\5.6\msvc2015_64
66
SET QTDIR32=C:\Qt\5.6\msvc2015
7+
SET build_browser=OFF
78
SET cef_root_64=C:\beam\cef_binary_3.2883.1548.gd6fc4a4_windows64
89
SET cef_root_32=C:\beam\cef_binary_3.2883.1548.gd6fc4a4_windows32
910
SET browser=C:\beam\obs-browser-1.23
@@ -19,6 +20,7 @@ if "%1" == "all" (
1920
SET build32=true
2021
SET build64=true
2122
SET package=true
23+
SET install_browser=true
2224
)
2325
if "%1" == "win64" (
2426
SET build64=true
@@ -46,7 +48,7 @@ if defined build32 (
4648
echo Currently in Directory %cd%
4749
rmdir CMakeFiles /s /q
4850
del CMakeCache.txt
49-
cmake -G "Visual Studio 14 2015" -DCOMPILE_D3D12_HOOK=true -DCEF_ROOT_DIR=%cef_root_32% -DBUILD_BROWSER=ON -DOBS_VERSION_OVERRIDE=%obs_version% -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true .. || goto DONE
51+
cmake -G "Visual Studio 14 2015" -DCOMPILE_D3D12_HOOK=true -DCEF_ROOT_DIR=%cef_root_32% -DBUILD_BROWSER=%build_browser% -DOBS_VERSION_OVERRIDE=%obs_version% -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true .. || goto DONE
5052
call msbuild /p:Configuration=%build_config% ALL_BUILD.vcxproj
5153
copy %coredeps%\win32\bin\postproc-54.dll rundir\%build_config%\bin\32bit
5254
)
@@ -55,7 +57,7 @@ if defined build64 (
5557
echo Currently in Directory %cd%
5658
rmdir CMakeFiles /s /q
5759
del CMakeCache.txt
58-
cmake -G "Visual Studio 14 2015 Win64" -DCEF_ROOT_DIR=%cef_root_64% -DBUILD_BROWSER=ON -DCOMPILE_D3D12_HOOK=true -DOBS_VERSION_OVERRIDE=%obs_version% -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true .. || goto DONE
60+
cmake -G "Visual Studio 14 2015 Win64" -DCEF_ROOT_DIR=%cef_root_64% -DBUILD_BROWSER=%build_browser% -DCOMPILE_D3D12_HOOK=true -DOBS_VERSION_OVERRIDE=%obs_version% -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true .. || goto DONE
5961
call msbuild /p:Configuration=%build_config%,Platform=x64 ALL_BUILD.vcxproj || goto DONE
6062
copy %coredeps%\win64\bin\postproc-54.dll rundir\%build_config%\bin\64bit
6163
)

0 commit comments

Comments
 (0)