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.

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

Kimkulling/fix vcpkg build #29

Merged
merged 4 commits into from
Aug 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": 3,
"configurePresets": [
{
"name": "default",
"binaryDir": "${sourceDir}",
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": "contrib/osre/contrib/vcpkg/scripts/buildsystems/vcpkg.cmake"
}
}
]
}

2 changes: 1 addition & 1 deletion contrib/osre
Submodule osre updated 933 files
4 changes: 2 additions & 2 deletions src/ModelLoading.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ using namespace ::OSRE::Common;
using namespace ::OSRE::RenderBackend;

/// @brief The log-tag
static constexpr c8 Tag[] = "ModelLoadingApp";
static constexpr c8 Tag[] = "Assimp-Viewer";

//-------------------------------------------------------------------------------------------------
/// @ingroup Editor
Expand Down Expand Up @@ -185,7 +185,7 @@ class ModelLoadingApp : public App::AppBase {

int main(int argc, char *argv[]) {
ModelLoadingApp myApp(argc, argv);
if (!myApp.initWindow(10, 10, 1024, 768, "ModelLoader sample! Press o to import an Asset", false, false, App::RenderBackendType::OpenGLRenderBackend)) {
if (!myApp.initWindow(10, 10, 1024, 768, "Assimp-Vewer! Press o to import an Asset", false, false, App::RenderBackendType::OpenGLRenderBackend)) {
return 1;
}

Expand Down
6 changes: 6 additions & 0 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"dependencies": [
"glm",
"sdl2"
]
}