Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support building of loadtest apps with locally installed dependencies #799

Merged
merged 33 commits into from
Nov 12, 2023
+220 −76
Merged

Support building of loadtest apps with locally installed dependencies #799

Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f8ed876
Fix conflict between ktx.dll and ktx.exe PDB files.
MarkCallow Nov 5, 2023
c5b78b4
Support building with locally installed packages.
MarkCallow Nov 9, 2023
31a1b66
Build loadtests on arm64.
MarkCallow Nov 9, 2023
1220c93
Fix passing of CMAKE_TOOLCHAIN_FILE to build step.
MarkCallow Nov 9, 2023
ce4dd7b
Add required syntax.
MarkCallow Nov 9, 2023
0326d82
Fix many issues building with repo libs.
MarkCallow Nov 9, 2023
c549a1b
Add missing _LIBRARIES.
MarkCallow Nov 9, 2023
31678b2
Uncomment find_package commands.
MarkCallow Nov 10, 2023
cfcbde2
Only install vcpkg packages when building loadtests.
MarkCallow Nov 10, 2023
b03bcb8
Update vcpkg in an attempt to fix errors and cat log file to see fail…
MarkCallow Nov 10, 2023
28f8d90
Do not use SDL found on host when host != target.
MarkCallow Nov 10, 2023
73c8e5a
Fix the tests for host != target.
MarkCallow Nov 10, 2023
463eba5
Fix case mismatch in processor names.
MarkCallow Nov 10, 2023
2680ee6
Remove the vcpkg package update.
MarkCallow Nov 10, 2023
8b1e26a
Install sdl2, assimp only when ARCHS and processor match.
MarkCallow Nov 10, 2023
1a4d661
Fix typo.
MarkCallow Nov 10, 2023
3719f1e
Fix YAT.
MarkCallow Nov 10, 2023
aa4f58d
Explicitly add GLEW includes and libraries.
MarkCallow Nov 11, 2023
58eb7a9
GLEW...DIRS to GLEW...DIR.
MarkCallow Nov 11, 2023
2cebbca
Check in-use Win SDK and ls its libraries.
MarkCallow Nov 11, 2023
8b82111
Move in-use SDK check to build_win.ps1.
MarkCallow Nov 11, 2023
d4c0d4b
Only do in-use SDK version check when building loadtests.
MarkCallow Nov 11, 2023
e563a8f
Convert NSIS retry script to Bash.
MarkCallow Nov 11, 2023
91d734b
Add missing ".
MarkCallow Nov 11, 2023
de207a4
Attemp to override selected Windows SDK for oe with glu32.
MarkCallow Nov 11, 2023
743e92d
Improve logging of SDK info.
MarkCallow Nov 11, 2023
8e0eb0b
Don't use generator expression for GLEW_LIBS.
MarkCallow Nov 11, 2023
f5e5251
Turn off loadtests for arm64 build until lib issue resolved.
MarkCallow Nov 12, 2023
656846e
Fix test for whether loadtests is set.
MarkCallow Nov 12, 2023
77bd52f
Fix test properly this time.
MarkCallow Nov 12, 2023
1aad3be
Don't require OpenGL for iOS builds.
MarkCallow Nov 12, 2023
c2eab4d
Remove debug log messages and 2nd addition of glew.lib.
MarkCallow Nov 12, 2023
8a82392
Comment out printing of SDK version.
MarkCallow Nov 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix test properly this time.
@MarkCallow
MarkCallow committed Nov 12, 2023
commit 77bd52f3961a57f008829c1384e029a20ebb52da
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
View file
Original file line number Diff line number Diff line change
@@ -184,7 +184,7 @@ jobs:
}

- name: Install Dependencies for load tests on arm64
if: matrix.arch == 'arm64' && matrix.options.loadtests == 'OFF'
if: matrix.arch == 'arm64' && matrix.options.loadtests != 'OFF'
run: |
pushd $env:VCPKG_INSTALLATION_ROOT
./vcpkg install SDL2:arm64-windows assimp:arm64-windows glew:arm64-windows