mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-13 20:07:07 +02:00
Remove VCPKG references.
This commit is contained in:
parent
e7e5305102
commit
98b65f4af2
3 changed files with 1 additions and 94 deletions
|
@ -1,15 +1,12 @@
|
|||
#
|
||||
# Created by Bradley Austin Davis on 2018/07/22
|
||||
# Copyright 2013-2018 High Fidelity, Inc.
|
||||
# Copyright 2025 Overte e.V.
|
||||
#
|
||||
# Distributed under the Apache License, Version 2.0.
|
||||
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
#
|
||||
macro(TARGET_JSON)
|
||||
# We use vcpkg for both json and glm, so we just re-use the target_glm macro here
|
||||
# target_glm()
|
||||
|
||||
|
||||
find_package(nlohmann_json REQUIRED)
|
||||
target_link_libraries(${TARGET_NAME} nlohmann_json::nlohmann_json)
|
||||
endmacro()
|
|
@ -1,60 +0,0 @@
|
|||
From 1e4955adbcd9b3f5eaf2129e918ca057baed6520 Mon Sep 17 00:00:00 2001
|
||||
From: Arcady Goldmints-Orlov <arcady@lunarg.com>
|
||||
Date: Mon, 20 Feb 2023 20:02:36 -0500
|
||||
Subject: [PATCH] Include <cstdint> header in Common.h
|
||||
|
||||
This change also cleans up some ifdef'd code for no longer supported
|
||||
versions of MSVC.
|
||||
|
||||
Fixes: #3139
|
||||
---
|
||||
glslang/Include/Common.h | 19 ++-----------------
|
||||
1 file changed, 2 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/glslang/Include/Common.h b/glslang/Include/Common.h
|
||||
index c7f52563..080b8071 100644
|
||||
--- a/glslang/Include/Common.h
|
||||
+++ b/glslang/Include/Common.h
|
||||
@@ -44,6 +44,7 @@
|
||||
#else
|
||||
#include <cmath>
|
||||
#endif
|
||||
+#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <list>
|
||||
@@ -66,7 +67,7 @@ std::string to_string(const T& val) {
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) || (defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API)
|
||||
+#if defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API
|
||||
#include <basetsd.h>
|
||||
#ifndef snprintf
|
||||
#define snprintf sprintf_s
|
||||
@@ -82,22 +83,6 @@ std::string to_string(const T& val) {
|
||||
#define UINT_PTR uintptr_t
|
||||
#endif
|
||||
|
||||
-#if defined(_MSC_VER) && _MSC_VER < 1800
|
||||
- #include <stdlib.h>
|
||||
- inline long long int strtoll (const char* str, char** endptr, int base)
|
||||
- {
|
||||
- return _strtoi64(str, endptr, base);
|
||||
- }
|
||||
- inline unsigned long long int strtoull (const char* str, char** endptr, int base)
|
||||
- {
|
||||
- return _strtoui64(str, endptr, base);
|
||||
- }
|
||||
- inline long long int atoll (const char* str)
|
||||
- {
|
||||
- return strtoll(str, NULL, 10);
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
#if defined(_MSC_VER)
|
||||
#define strdup _strdup
|
||||
#endif
|
||||
--
|
||||
2.47.2
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Fri, 2 Aug 2024 22:44:21 +0100
|
||||
Subject: [PATCH] SPIRV/SpvBuilder.h: add missing <cstdint> include
|
||||
|
||||
Without the change `glslang` build fails on upcoming `gcc-15` as:
|
||||
|
||||
In file included from /build/source/SPIRV/GlslangToSpv.cpp:45:
|
||||
SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared
|
||||
248 | Id makeDebugLexicalBlock(uint32_t line);
|
||||
| ^~~~~~~~
|
||||
---
|
||||
SPIRV/SpvBuilder.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h
|
||||
index f86dd81b..d688436a 100644
|
||||
--- a/SPIRV/SpvBuilder.h
|
||||
+++ b/SPIRV/SpvBuilder.h
|
||||
@@ -56,6 +56,7 @@ namespace spv {
|
||||
}
|
||||
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <set>
|
||||
--
|
||||
2.47.2
|
||||
|
Loading…
Reference in a new issue