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

Move self-hosted dependencies to external folder #909

Merged
merged 25 commits into from
May 28, 2024
Merged

Move self-hosted dependencies to external folder #909

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
dd54f59
Move basisu to external folder
MathiasMagnus May 14, 2024
84f4b7a
Update scripts for basisu move
MathiasMagnus May 14, 2024
ea8163f
Update .gitignore for basisu move
MathiasMagnus May 14, 2024
8793601
Update dep5 for basisu move
MathiasMagnus May 14, 2024
193cce1
Move astc-encoder to external folder
MathiasMagnus May 14, 2024
fdeaad3
Update scripts for astc-encoder move
MathiasMagnus May 14, 2024
8b53c49
Update dep5 for astc-encoder move
MathiasMagnus May 14, 2024
e287cc2
Move cxxopts to external folder
MathiasMagnus May 14, 2024
a7c9bd5
Update scripts for cxxopts move
MathiasMagnus May 14, 2024
4551d55
Update README for cxxopts move
MathiasMagnus May 14, 2024
0a73ccd
Update dep5 for cxxopts move
MathiasMagnus May 14, 2024
713af76
Move fmt to external folder
MathiasMagnus May 14, 2024
9f4d208
Update scripts for fmt move
MathiasMagnus May 14, 2024
4b5d24f
Move dfdutils to external folder
MathiasMagnus May 14, 2024
80e31f0
Update scripts for dfdutils move
MathiasMagnus May 14, 2024
4ba0574
Update dep5 for dfdutils move
MathiasMagnus May 14, 2024
069699a
Move etcdec to external folder
MathiasMagnus May 14, 2024
d6af6fa
Update scripts for etcdec move
MathiasMagnus May 14, 2024
3f40369
Fix glloadtests on Windows
MathiasMagnus May 14, 2024
71520e4
Fix Emscripten build
MathiasMagnus May 16, 2024
6151f99
Fix ISO C++ conformance
MathiasMagnus May 16, 2024
4311d43
Fix vkloadtests on Windows
MathiasMagnus May 17, 2024
e64e7f9
Add missing dep5 coverage
MathiasMagnus May 17, 2024
fe1eeb3
Various Reuse fixes
MathiasMagnus May 21, 2024
6a79bb2
Fix Emscripten build
MathiasMagnus May 27, 2024
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
1 change: 1 addition & 0 deletions tests/loadtests/vkloadtests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ target_compile_definitions(
vkloadtests
PRIVATE
$<TARGET_PROPERTY:ktx,INTERFACE_COMPILE_DEFINITIONS>
$<$<PLATFORM_ID:Windows>:NOMINMAX>
MarkCallow marked this conversation as resolved.
Show resolved Hide resolved
)

set_target_properties( vkloadtests PROPERTIES RESOURCE "${KTX_RESOURCES};${SHADER_SOURCES}" )
Expand Down
3 changes: 0 additions & 3 deletions tests/loadtests/vkloadtests/InstancedSampleBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
#include <time.h>
#include <vector>

#if defined(_WIN32)
#define NOMINMAX // Prevent windows.h min max defines from causing trouble.
#endif
#include "argparser.h"
#include "InstancedSampleBase.h"
#include "ltexceptions.h"
Expand Down