diff --git a/engine/ResourceManager.cpp b/engine/ResourceManager.cpp index a89f110..969e4ae 100644 --- a/engine/ResourceManager.cpp +++ b/engine/ResourceManager.cpp @@ -143,7 +143,7 @@ std::vector> ResourceManager::loadObjects(const std::strin char junk; if(line[0] == 'o') { if(!tris.empty()) - objects.push_back(make_shared(tris)); + objects.push_back(std::make_shared(tris)); tris.clear(); } if (line[0] == 'v') @@ -175,7 +175,7 @@ std::vector> ResourceManager::loadObjects(const std::strin } if(!tris.empty()) - objects.push_back(make_shared(tris)); + objects.push_back(std::make_shared(tris)); file.close(); diff --git a/shooter.vcxproj b/shooter.vcxproj index 0b73fbd..8ca08da 100644 --- a/shooter.vcxproj +++ b/shooter.vcxproj @@ -88,14 +88,14 @@ true WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - SFML\include + SFML-VS32\include stdcpp20 stdc17 Console true - SFML\lib + SFML-VS32\lib opengl32.lib;sfml-graphics-d.lib;sfml-window-d.lib;sfml-audio-d.lib;sfml-network-d.lib;sfml-system-d.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - SFML\include + SFML-VS32\include stdcpp20 stdc17 @@ -116,7 +116,7 @@ true true true - SFML\lib + SFML-VS32\lib opengl32.lib;sfml-graphics.lib;sfml-window.lib;sfml-audio.lib;sfml-network.lib;sfml-system.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -126,14 +126,14 @@ true _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - SFML\include + SFML-VS32\include stdcpp20 stdc17 Console true - SFML\lib + SFML-VS32\lib opengl32.lib;sfml-graphics-d.lib;sfml-window-d.lib;sfml-audio-d.lib;sfml-network-d.lib;sfml-system-d.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -145,7 +145,7 @@ true NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - SFML\include + SFML-VS32\include stdcpp20 stdc17 @@ -154,7 +154,7 @@ true true true - SFML\lib + SFML-VS32\lib opengl32.lib;sfml-graphics.lib;sfml-window.lib;sfml-audio.lib;sfml-network.lib;sfml-system.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)