From c9c334fb1fd9e875389e447a0791b92e3f6ba3ed Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Wed, 7 Feb 2024 09:52:47 +1100 Subject: [PATCH 1/2] vs gitignore /.vs/ (cherry picked from commit 499fcff85ac6ca407887234580dcc872cd6afee6) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 58f2ddbff45..62e1d858d0b 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,4 @@ projectGenerator*/ .cxx/ libs/openFrameworksCompiled/project/vs/.vs/ scripts/templates/vs/.vs/ +**/.vs/ From 5b0040132ca8fe696a2f0a9187d5959d7dff84e0 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Wed, 7 Feb 2024 10:20:06 +1100 Subject: [PATCH 2/2] VS 2022 - VideoGrabber Debug Mode fix --- .github/workflows/build-vs2022.yml | 11 ++++++++++- .../project/vs/openFrameworksDebug.props | 6 +++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-vs2022.yml b/.github/workflows/build-vs2022.yml index e8e1a992d60..857421267b0 100644 --- a/.github/workflows/build-vs2022.yml +++ b/.github/workflows/build-vs2022.yml @@ -41,7 +41,7 @@ jobs: run: ./scripts/ci/vs/install_bleeding.sh - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 - name: Build emptyExample working-directory: ${{env.GITHUB_WORKSPACE}} run: @@ -50,5 +50,14 @@ jobs: working-directory: ${{env.GITHUB_WORKSPACE}} run: msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 + - name: Build DEBUG emptyExample + working-directory: ${{env.GITHUB_WORKSPACE}} + run: + msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 + - name: Build DEBUG allAddonsExample + working-directory: ${{env.GITHUB_WORKSPACE}} + run: + msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 + diff --git a/libs/openFrameworksCompiled/project/vs/openFrameworksDebug.props b/libs/openFrameworksCompiled/project/vs/openFrameworksDebug.props index d07ac85d9c0..fc0cdc344db 100644 --- a/libs/openFrameworksCompiled/project/vs/openFrameworksDebug.props +++ b/libs/openFrameworksCompiled/project/vs/openFrameworksDebug.props @@ -16,7 +16,7 @@ $(OF_ROOT)\libs\glfw\lib\vs\x64;$(OF_ROOT)\libs\rtAudio\lib\vs\x64;$(OF_ROOT)\libs\FreeImage\lib\vs\x64;$(OF_ROOT)\libs\freetype\lib\vs\x64;$(OF_ROOT)\libs\fmod\lib\vs\x64;$(OF_ROOT)\libs\videoInput\lib\vs\x64;$(OF_ROOT)\libs\cairo\lib\vs\x64;$(OF_ROOT)\libs\pixman\lib\vs\x64;$(OF_ROOT)\libs\libpng\lib\vs\x64;$(OF_ROOT)\libs\zlib\lib\vs\x64;$(OF_ROOT)\libs\glew\lib\vs\x64;$(OF_ROOT)\libs\glu\lib\vs\x64;$(OF_ROOT)\libs\openssl\lib\vs\x64;$(OF_ROOT)\libs\curl\lib\vs\x64;$(OF_ROOT)\libs\tess2\lib\vs\x64;$(OF_ROOT)\libs\boost\lib\vs\x64;$(OF_ROOT)\libs\uriparser\lib\vs\x64;$(OF_ROOT)\libs\pugixml\lib\vs\x64;%(AdditionalLibraryDirectories) - libcairo.lib;libpixman-1.lib;libpng.lib;zlib.lib;msimg32.lib;OpenGL32.lib;kernel32.lib;setupapi.lib;Vfw32.lib;comctl32.lib;rtAudioD.lib;videoInput.lib;freetyped.lib;FreeImageD.lib;dsound.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;libglew32.lib;fmod64_vc.lib;libssl.lib;libcrypto.lib;crypt32.lib;libcurl.lib;uriparser.lib;pugixmlD.lib;Ws2_32.lib;tess2.lib;glfw3.lib;winmm.lib;%(AdditionalDependencies) + libcairo.lib;libpixman-1.lib;libpng.lib;zlib.lib;msimg32.lib;OpenGL32.lib;kernel32.lib;setupapi.lib;Vfw32.lib;comctl32.lib;rtAudioD.lib;videoInputD.lib;freetyped.lib;FreeImageD.lib;dsound.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;libglew32.lib;fmod64_vc.lib;libssl.lib;libcrypto.lib;crypt32.lib;libcurl.lib;uriparser.lib;pugixmlD.lib;Ws2_32.lib;tess2.lib;glfw3.lib;winmm.lib;%(AdditionalDependencies) /ignore:4099 %(AdditionalOptions) false atlthunk.lib;msvcrt;libcmt;LIBC;LIBCMTD @@ -30,7 +30,7 @@ $(OF_ROOT)\libs\glfw\lib\vs\ARM64;$(OF_ROOT)\libs\rtAudio\lib\vs\ARM64;$(OF_ROOT)\libs\FreeImage\lib\vs\ARM64;$(OF_ROOT)\libs\freetype\lib\vs\ARM64;$(OF_ROOT)\libs\fmod\lib\vs\ARM64;$(OF_ROOT)\libs\videoInput\lib\vs\ARM64;$(OF_ROOT)\libs\cairo\lib\vs\ARM64;$(OF_ROOT)\libs\pixman\lib\vs\ARM64;$(OF_ROOT)\libs\libpng\lib\vs\ARM64;$(OF_ROOT)\libs\zlib\lib\vs\ARM64;$(OF_ROOT)\libs\glew\lib\vs\ARM64;$(OF_ROOT)\libs\glu\lib\vs\ARM64;$(OF_ROOT)\libs\openssl\lib\vs\ARM64;$(OF_ROOT)\libs\curl\lib\vs\ARM64;$(OF_ROOT)\libs\tess2\lib\vs\ARM64;$(OF_ROOT)\libs\boost\lib\vs\ARM64;$(OF_ROOT)\libs\uriparser\lib\vs\ARM64;$(OF_ROOT)\libs\pugixml\lib\vs\ARM64;%(AdditionalLibraryDirectories) - libcairo.lib;libpixman-1.lib;libpng.lib;zlib.lib;msimg32.lib;OpenGL32.lib;kernel32.lib;setupapi.lib;Vfw32.lib;comctl32.lib;rtAudioD.lib;freetyped.lib;FreeImageD.lib;dsound.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;libglew32.lib;;libssl.lib;libcrypto.lib;crypt32.lib;libcurl.lib;uriparser.lib;pugixmlD.lib;Ws2_32.lib;tess2.lib;glfw3.lib;winmm.lib;%(AdditionalDependencies) + libcairo.lib;libpixman-1.lib;libpng.lib;zlib.lib;msimg32.lib;OpenGL32.lib;kernel32.lib;setupapi.lib;Vfw32.lib;comctl32.lib;rtAudioD.lib;videoInputD.lib;freetyped.lib;FreeImageD.lib;dsound.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;libglew32.lib;;libssl.lib;libcrypto.lib;crypt32.lib;libcurl.lib;uriparser.lib;pugixmlD.lib;Ws2_32.lib;tess2.lib;glfw3.lib;winmm.lib;%(AdditionalDependencies) /ignore:4099 %(AdditionalOptions) true atlthunk.lib;msvcrt;libcmt;LIBC;LIBCMTD @@ -44,7 +44,7 @@ $(OF_ROOT)\libs\glfw\lib\vs\ARM64EC;$(OF_ROOT)\libs\rtAudio\lib\vs\ARM64EC;$(OF_ROOT)\libs\FreeImage\lib\vs\ARM64EC;$(OF_ROOT)\libs\freetype\lib\vs\ARM64EC;$(OF_ROOT)\libs\fmod\lib\vs\ARM64EC;$(OF_ROOT)\libs\videoInput\lib\vs\ARM64EC;$(OF_ROOT)\libs\cairo\lib\vs\ARM64EC;$(OF_ROOT)\libs\pixman\lib\vs\ARM64EC;$(OF_ROOT)\libs\libpng\lib\vs\ARM64EC;$(OF_ROOT)\libs\zlib\lib\vs\ARM64EC;$(OF_ROOT)\libs\glew\lib\vs\ARM64EC;$(OF_ROOT)\libs\glu\lib\vs\ARM64EC;$(OF_ROOT)\libs\openssl\lib\vs\ARM64EC;$(OF_ROOT)\libs\curl\lib\vs\ARM64EC;$(OF_ROOT)\libs\tess2\lib\vs\ARM64EC;$(OF_ROOT)\libs\boost\lib\vs\ARM64EC;$(OF_ROOT)\libs\uriparser\lib\vs\ARM64EC;$(OF_ROOT)\libs\pugixml\lib\vs\ARM64EC;%(AdditionalLibraryDirectories) - libcairo.lib;libpixman-1.lib;libpng.lib;zlib.lib;msimg32.lib;OpenGL32.lib;kernel32.lib;setupapi.lib;Vfw32.lib;comctl32.lib;rtAudioD.lib;freetyped.lib;FreeImageD.lib;dsound.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;libglew32.lib;;libssl.lib;libcrypto.lib;crypt32.lib;libcurl.lib;uriparser.lib;pugixmlD.lib;Ws2_32.lib;tess2.lib;glfw3.lib;winmm.lib;%(AdditionalDependencies) + libcairo.lib;libpixman-1.lib;libpng.lib;zlib.lib;msimg32.lib;OpenGL32.lib;kernel32.lib;setupapi.lib;Vfw32.lib;comctl32.lib;rtAudioD.lib;videoInputD.lib;freetyped.lib;FreeImageD.lib;dsound.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;libglew32.lib;;libssl.lib;libcrypto.lib;crypt32.lib;libcurl.lib;uriparser.lib;pugixmlD.lib;Ws2_32.lib;tess2.lib;glfw3.lib;winmm.lib;%(AdditionalDependencies) /ignore:4099 %(AdditionalOptions) true atlthunk.lib;msvcrt;libcmt;LIBC;LIBCMTD