This repository was archived by the owner on Sep 2, 2019. It is now read-only.
File tree Expand file tree Collapse file tree 5 files changed +14
-5
lines changed
Expand file tree Collapse file tree 5 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -62,6 +62,14 @@ IF(MSVC)
6262 if (${_TESTVAR} EQUAL "-1" )
6363 set (_PARAM "${_PARAM} /MP" )
6464 endif ()
65+
66+ # exceptions (for msvc 2017)
67+ string (FIND "${${flag_var} }" "/EHa" _TESTVAR)
68+ if (${_TESTVAR} EQUAL "-1" )
69+ set (_PARAM "${_PARAM} /EHa" )
70+ endif ()
71+
72+
6573 if (_PARAM)
6674 set (${flag_var} "${${flag_var} } ${_PARAM} " CACHE STRING "" FORCE)
6775 ENDIF ()
Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ Library | Description
5656[ Release] ( https://github.com/ZCube/ActWebSocketOverlay/releases )
5757
5858## Build Tool
59- Microsoft Visual Studio Community 2015
59+ Microsoft Visual Studio Community 2017
6060
6161## Build Instruction
6262~~ * boost build step~~
Original file line number Diff line number Diff line change 11@ echo off
22set _ROOT = %CD%
33pushd external\reshade
4- CALL " %VS140COMNTOOLS% vsvars32 .bat"
4+ CALL " %ProgramFiles(x86)% \Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32 .bat"
55msbuild ReShade.sln /property:Configuration=Release " /property:Platform=32-bit"
66msbuild ReShade.sln /property:Configuration=Release " /property:Platform=64-bit"
77popd
Original file line number Diff line number Diff line change 11@ echo off
2+ CALL " %ProgramFiles(x86)% \Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
23set _ROOT = %CD%
34
45if not exist build\64 mkdir build\64
56pushd build\64
6- cmake -G " Visual Studio 14 2015 Win64" %_ROOT% ^
7+ cmake -G " Visual Studio 15 2017 Win64" %_ROOT% ^
78 " -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=%_ROOT% /bin/64" ^
89 " -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=%_ROOT% /lib/64" ^
910 " -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=%_ROOT% /bin/64"
1011popd
1112
1213if not exist build\32 mkdir build\32
1314pushd build\32
14- cmake -G " Visual Studio 14 2015 " %_ROOT% ^
15+ cmake -G " Visual Studio 15 2017 " %_ROOT% ^
1516 " -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=%_ROOT% /bin/32" ^
1617 " -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=%_ROOT% /lib/32" ^
1718 " -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=%_ROOT% /bin/32"
Original file line number Diff line number Diff line change 22
33## Download ACTWebSocket Plugin
44
5- Download ACTWebSocket Plugin and unzip.
5+ Download [ ACTWebSocket Plugin] ( https://github.com/ZCube/ACTWebSocket/releases ) and unzip.
66
77If you use windows defender, you may need to unblock files. See this [ link] ( https://blogs.msdn.microsoft.com/delay/p/unblockingdownloadedfile/ )
88
You can’t perform that action at this time.
0 commit comments