From 2a465469cc47c555c02d4a976d06278c95b29834 Mon Sep 17 00:00:00 2001 From: "R.E. Kovalev" Date: Tue, 11 Jul 2023 15:51:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20ti?= =?UTF-8?q?nyglTF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/c_cpp_properties.json | 3 ++- Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 04cf9c6..f41ec15 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -8,7 +8,8 @@ "${workspaceFolder}/../dependencies/glad/include", "${workspaceFolder}/../dependencies/glm", "${workspaceFolder}/../dependencies/stb", - "${workspaceFolder}/../dependencies/tinyobjloader" + "${workspaceFolder}/../dependencies/tinyobjloader", + "${workspaceFolder}/../dependencies/tinyglTF" ], "compilerPath": "C:/MinGW/bin/g++.exe", "cStandard": "c11", diff --git a/Makefile b/Makefile index c270acc..dfc9036 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,10 @@ CFLAGS += -I../dependencies/glad/include CFLAGS += -I../dependencies/glm CFLAGS += -I../dependencies/stb CFLAGS += -I../dependencies/tinyobjloader +CFLAGS += -I../dependencies/tinyglTF # Опции линкера -LDFLAGS += --std=c++11 +LDFLAGS += --std=gnu++11 # Архитектурозависимые опции линкера ifeq ($(OS), Windows_NT) # GLFW в зависимости от архитектуры