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 в зависимости от архитектуры