diff --git a/Umbra.CPP.props b/Umbra.CPP.props index 67da68c..15c84c7 100644 --- a/Umbra.CPP.props +++ b/Umbra.CPP.props @@ -1,21 +1,6 @@  - - - Debug - x64 - - - Release - x64 - - - - - - - - - + + @@ -26,32 +11,29 @@ x64 - $(SolutionDir)bin\$(Configuration)\ - $(SolutionDir)obj\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\$(MSBuildProjectName)\ + $(SolutionDir)obj\$(Configuration)\$(MSBuildProjectName)\ + $(SolutionDir) Application - v143 Unicode - + + true + true - - false - true - - - true - - + false + false true + NotUsing @@ -63,6 +45,8 @@ pch.h stdcpp20 true + + %(AdditionalIncludes.Split(';'));asd;%(AdditionalIncludeDirectories) Console diff --git a/Umbra.props b/Umbra.props new file mode 100644 index 0000000..0d9948f --- /dev/null +++ b/Umbra.props @@ -0,0 +1,13 @@ + + + + Debug + x64 + + + Release + x64 + + + + \ No newline at end of file diff --git a/projs/shadow-engine/shadow-engine.cpp b/projs/shadow-engine/shadow-engine.cpp index 7865a49..0ffdd3f 100644 --- a/projs/shadow-engine/shadow-engine.cpp +++ b/projs/shadow-engine/shadow-engine.cpp @@ -1,5 +1,6 @@ #include #include +#include // You must include the command line parameters for your main function to be recognized by SDL int main(int argc, char** args) { diff --git a/projs/shadow-engine/shadow-engine.vcxproj b/projs/shadow-engine/shadow-engine.vcxproj index 7183409..3d4c32e 100644 --- a/projs/shadow-engine/shadow-engine.vcxproj +++ b/projs/shadow-engine/shadow-engine.vcxproj @@ -18,32 +18,8 @@ - - - - - - - - - - - - + - - true - - - - true - - - false - - - false - diff --git a/projs/shadow-entity/shadow-entity.vcxproj b/projs/shadow-entity/shadow-entity.vcxproj index 6162b3d..ea2e7c8 100644 --- a/projs/shadow-entity/shadow-entity.vcxproj +++ b/projs/shadow-entity/shadow-entity.vcxproj @@ -1,162 +1,33 @@ - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {47591591-E091-4B88-8418-74D3CBEC5712} - Win32Proj - shadow_entity - 10.0 - - - - x64 - - - StaticLibrary - true - v143 - Unicode - - - StaticLibrary - false - v143 - true - Unicode - - - StaticLibrary - true - v143 - Unicode - - - StaticLibrary - false - v143 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - NotUsing - Level3 - Disabled - true - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - - - - - NotUsing - Level3 - Disabled - true - _DEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - - - - - NotUsing - Level3 - MaxSpeed - true - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - true - true - - - - - NotUsing - Level3 - MaxSpeed - true - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - true - true - - - - - - - - + + + + + 15.0 + {47591591-E091-4B88-8418-74D3CBEC5712} + Win32Proj + shadow_entity + 10.0 + + + StaticLibrary + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/projs/shadow-file-format-test/packages.config b/projs/shadow-file-format-test/packages.config new file mode 100644 index 0000000..88f987c --- /dev/null +++ b/projs/shadow-file-format-test/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/projs/shadow-file-format-test/pch.cpp b/projs/shadow-file-format-test/pch.cpp new file mode 100644 index 0000000..250fb27 --- /dev/null +++ b/projs/shadow-file-format-test/pch.cpp @@ -0,0 +1,5 @@ +// +// pch.cpp +// + +#include "pch.h" diff --git a/projs/shadow-file-format-test/pch.h b/projs/shadow-file-format-test/pch.h new file mode 100644 index 0000000..0572a70 --- /dev/null +++ b/projs/shadow-file-format-test/pch.h @@ -0,0 +1,7 @@ +// +// pch.h +// + +#pragma once + +#include "gtest/gtest.h" diff --git a/projs/shadow-file-format-test/shadow-file-format-test.vcxproj b/projs/shadow-file-format-test/shadow-file-format-test.vcxproj new file mode 100644 index 0000000..951ec61 --- /dev/null +++ b/projs/shadow-file-format-test/shadow-file-format-test.vcxproj @@ -0,0 +1,110 @@ + + + + + {3b7d6797-cc0c-43fa-8866-f438032e1c67} + Win32Proj + 10.0.19041.0 + Application + v143 + Unicode + shadow-file-format-test + + + + + + + + + + + + + + Create + Create + + + + + {b2e3515c-3fe0-44b9-9abe-8584a836230f} + + + + + + + + + + + + + Use + pch.h + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + + + true + Console + + + + + Use + pch.h + Disabled + X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + + + true + Console + + + + + Use + pch.h + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ProgramDatabase + + + true + Console + true + true + + + + + Use + pch.h + X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ProgramDatabase + + + true + Console + true + true + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/projs/shadow-file-format-test/shadow-file-format-test.vcxproj.user b/projs/shadow-file-format-test/shadow-file-format-test.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/projs/shadow-file-format-test/shadow-file-format-test.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/projs/shadow-file-format-test/test.cpp b/projs/shadow-file-format-test/test.cpp new file mode 100644 index 0000000..e238589 --- /dev/null +++ b/projs/shadow-file-format-test/test.cpp @@ -0,0 +1,6 @@ +#include "pch.h" + +TEST(TestCaseName, TestName) { + EXPECT_EQ(1, 1); + EXPECT_TRUE(true); +} \ No newline at end of file diff --git a/projs/shadow-file-format/shadow-file-format.vcxproj b/projs/shadow-file-format/shadow-file-format.vcxproj index a57f291..69655da 100644 --- a/projs/shadow-file-format/shadow-file-format.vcxproj +++ b/projs/shadow-file-format/shadow-file-format.vcxproj @@ -1,23 +1,6 @@ - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - + 15.0 {B2E3515C-3FE0-44B9-9ABE-8584A836230F} @@ -25,136 +8,24 @@ shadow_file_format 10.0 + + StaticLibrary + - - x64 - - - StaticLibrary - true - v143 - Unicode - - - StaticLibrary - false - v143 - true - Unicode - - - StaticLibrary - true - v143 - Unicode - - - StaticLibrary - false - v143 - true - Unicode - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - NotUsing - Level3 - Disabled - true - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - - - - - NotUsing - Level3 - Disabled - true - _DEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - - - - - NotUsing - Level3 - MaxSpeed - true - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - true - true - - - - - NotUsing - Level3 - MaxSpeed - true - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - true - true - - - + + + + + + {7b9e6056-e4fb-411b-9612-a2fd679c2b69} + diff --git a/projs/shadow-file-format/shadow-file-format.vcxproj.filters b/projs/shadow-file-format/shadow-file-format.vcxproj.filters index 5d15f65..f322c4d 100644 --- a/projs/shadow-file-format/shadow-file-format.vcxproj.filters +++ b/projs/shadow-file-format/shadow-file-format.vcxproj.filters @@ -15,8 +15,31 @@ - + + Source Files + + + Source Files + + Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/projs/shadow-file-format/shadow-file-format.vcxproj.user b/projs/shadow-file-format/shadow-file-format.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/projs/shadow-file-format/shadow-file-format.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/projs/shadow-file-format/src/SFFElement.cpp b/projs/shadow-file-format/src/SFFElement.cpp new file mode 100644 index 0000000..82d4975 --- /dev/null +++ b/projs/shadow-file-format/src/SFFElement.cpp @@ -0,0 +1,26 @@ +//#include "pch.h" +#include "SFFElement.h" + +SFFElement* SFFElement::GetFirstChild() +{ + return children.size() > 0 ? children[0]: nullptr; +} + +SFFElement* SFFElement::GetChildByIndex(int i) +{ + ChildrenMap::iterator it = children.begin(); + for (size_t i = 0; i < i; i++) + { + it++; + } + return it->second; +} + +SFFElement* SFFElement::GetChildByName(std::string name) +{ + ChildrenMap::iterator it = children.find(name); + if (it != children.end()) { + return it->second; + } + return nullptr; +} diff --git a/projs/shadow-file-format/src/SFFElement.h b/projs/shadow-file-format/src/SFFElement.h new file mode 100644 index 0000000..1002099 --- /dev/null +++ b/projs/shadow-file-format/src/SFFElement.h @@ -0,0 +1,31 @@ +#pragma once + +#include +#include +#include + +class SFFElement +{ +public: + SFFElement* parent; + + std::string name; + + bool isBlock; + + std::string value; + typedef std::map ChildrenMap; + + std::list properties_old; + std::map children; + + std::string GetStringProperty(std::string name); + + SFFElement* GetFirstChild(); + + SFFElement* GetChildByIndex(int i); + SFFElement* GetChildByName(std::string name); + + ~SFFElement(); + +}; diff --git a/projs/shadow-file-format/src/SFFParser.cpp b/projs/shadow-file-format/src/SFFParser.cpp new file mode 100644 index 0000000..4d056ca --- /dev/null +++ b/projs/shadow-file-format/src/SFFParser.cpp @@ -0,0 +1,121 @@ +#include "SFFParser.h" + +#include +#include + +import shadow_utils; + + +namespace ShadowEngine::SFF { + + SFFElement* SFFParser::ReadFromStream(std::istream& stream) + { + auto version = ReadVersionFromHeader(stream); + if (version.invalid) { + //SH_CORE_WARN("Shadow File is invalid"); + return nullptr; + } + + + //The current node that we are building + auto* context = new SFFElement; + + //Top level Element + SFFElement* base = context; + + //The new node that will be a child of the context + auto* current = new SFFElement; + + + + + std::string buffer; + + char c; + while (!stream.eof()) + { + stream.get(c); + if (c == ':') + { + //The stuff in the buffer is a parameter name + std::cout << "Name: " << buffer; + current->name = buffer; + buffer = ""; + } + else if (c == '{') + { + //Start of a new block + current->isBlock = true; + current->parent = context; + context->children[current->name] = current; + context = current; + + current = new SFFElement; + } + else if (c == ',') + { + // End of a property + //The stuff is the value + std::cout << "Value: " << buffer << std::endl; + current->value = buffer; + current->parent = context; + current->isBlock = false; + buffer = ""; + + context->children[current->name] = current; + + current = new SFFElement(); + } + else if (c == '}') + { + // End of a block + context = context->parent; + } + else + { + if (std::isspace(c) == 0) + { + buffer += c; + } + } + } + + std::cout << "END" << std::endl; + + return base; + } + + SFFVersion SFFParser::ReadVersionFromHeader(std::istream& stream) { + std::string line; + std::getline(stream, line); + auto parts = explode(line, '_'); + if (parts[0] != "ShadowFileFormat") { + return SFFVersion(-1,-1,-1); + } + else { + int mayor = std::stoi(parts[1]); + int minor = std::stoi(parts[2]); + int patch = std::stoi(parts[3]); + return SFFVersion(mayor, minor, patch); + } + + } + + + + SFFElement* SFFParser::ReadFromFile(std::string path) + { + std::ifstream inputFileStream(path); + + if (errno) + { + //SH_CORE_ERROR("Error: {0} | File: {1}", strerror(errno), path); + //std::cerr << "Error: " << strerror(errno) << std::endl; + //std::cerr << "File: " << path << std::endl; + return nullptr; + } + + return ReadFromStream(inputFileStream); + } + +} diff --git a/projs/shadow-file-format/src/SFFParser.h b/projs/shadow-file-format/src/SFFParser.h new file mode 100644 index 0000000..09b0287 --- /dev/null +++ b/projs/shadow-file-format/src/SFFParser.h @@ -0,0 +1,17 @@ +#pragma once +#include "SFFElement.h" +#include "SFFVersion.h" + +namespace ShadowEngine::SFF { + + class SFFParser + { + public: + static SFFElement* ReadFromStream(std::istream& stream); + + static SFFVersion ReadVersionFromHeader(std::istream& stream); + + static SFFElement* ReadFromFile(std::string path); + }; + +} diff --git a/projs/shadow-file-format/src/SFFVersion.h b/projs/shadow-file-format/src/SFFVersion.h new file mode 100644 index 0000000..0f9815c --- /dev/null +++ b/projs/shadow-file-format/src/SFFVersion.h @@ -0,0 +1,25 @@ +#pragma once + +struct SFFVersion { +public: + int mayor; + int minor; + int patch; + + bool invalid; + + SFFVersion(int ma, int mi, int pa) + { + this->mayor = ma; + this->minor = mi; + this->patch = pa; + + if (ma >= 0 && mi >= 0 && pa >= 0) { + this->invalid = false; + } + else + { + invalid = true; + } + } +}; \ No newline at end of file diff --git a/projs/shadow-utility/shadow-utility.vcxproj b/projs/shadow-utility/shadow-utility.vcxproj new file mode 100644 index 0000000..3d499d7 --- /dev/null +++ b/projs/shadow-utility/shadow-utility.vcxproj @@ -0,0 +1,41 @@ + + + + + 15.0 + {7B9E6056-E4FB-411B-9612-A2FD679C2B69} + Win32Proj + shadow_utility + 10.0 + + + StaticLibrary + + + + + + + + + + + CompileAsCppModule + + + + + CompileAsCppModule + + + + + + + + + + + + + \ No newline at end of file diff --git a/projs/shadow-utility/shadow-utility.vcxproj.filters b/projs/shadow-utility/shadow-utility.vcxproj.filters new file mode 100644 index 0000000..4247255 --- /dev/null +++ b/projs/shadow-utility/shadow-utility.vcxproj.filters @@ -0,0 +1,28 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + + + + Source Files + + + \ No newline at end of file diff --git a/projs/shadow-utility/shadow-utility.vcxproj.user b/projs/shadow-utility/shadow-utility.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/projs/shadow-utility/shadow-utility.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/projs/shadow-utility/shadow-utils.ixx b/projs/shadow-utility/shadow-utils.ixx new file mode 100644 index 0000000..9585748 --- /dev/null +++ b/projs/shadow-utility/shadow-utils.ixx @@ -0,0 +1,5 @@ +export module shadow_utils; + +import std.core; + +export std::vector explode(const std::string& s, const char& c); \ No newline at end of file diff --git a/projs/shadow-utility/src/string-helpers.h b/projs/shadow-utility/src/string-helpers.h new file mode 100644 index 0000000..079a383 --- /dev/null +++ b/projs/shadow-utility/src/string-helpers.h @@ -0,0 +1,2 @@ +#pragma once + diff --git a/projs/shadow-utility/string-helpers.cpp b/projs/shadow-utility/string-helpers.cpp new file mode 100644 index 0000000..aa84ada --- /dev/null +++ b/projs/shadow-utility/string-helpers.cpp @@ -0,0 +1,19 @@ +module shadow_utils; + +import std.core; + + +inline std::vector explode(const std::string& s, const char& c) +{ + std::string buff; + std::vector v; + + for (auto n : s) + { + if (n != c) buff += n; else + if (n == c && buff != "") { v.push_back(buff); buff = ""; } + } + if (buff != "") v.push_back(buff); + + return v; +} \ No newline at end of file diff --git a/umbra.sln b/umbra.sln index 71019cf..aab276c 100644 --- a/umbra.sln +++ b/umbra.sln @@ -9,32 +9,38 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shadow-entity", "projs\shad EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vendor", "vendor", "{D53EF63D-47DE-4936-8707-CE5E59FC0F7A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shadow-file-format", "projs\shadow-file-format\src\shadow-file-format\shadow-file-format.vcxproj", "{9F590CAE-542E-46BE-BEA3-03DF7BDDC705}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shadow-file-format", "projs\shadow-file-format\shadow-file-format.vcxproj", "{B2E3515C-3FE0-44B9-9ABE-8584A836230F}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shadow-file-format-test", "projs\shadow-file-format-test\shadow-file-format-test.vcxproj", "{3B7D6797-CC0C-43FA-8866-F438032E1C67}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shadow-utility", "projs\shadow-utility\shadow-utility.vcxproj", "{7B9E6056-E4FB-411B-9612-A2FD679C2B69}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {76759923-036B-4D7B-A79C-332698CDC6A8}.Debug|Any CPU.ActiveCfg = Debug|x64 - {76759923-036B-4D7B-A79C-332698CDC6A8}.Debug|Any CPU.Build.0 = Debug|x64 - {76759923-036B-4D7B-A79C-332698CDC6A8}.Release|Any CPU.ActiveCfg = Release|Win32 - {76759923-036B-4D7B-A79C-332698CDC6A8}.Release|Any CPU.Build.0 = Release|Win32 - {47591591-E091-4B88-8418-74D3CBEC5712}.Debug|Any CPU.ActiveCfg = Debug|x64 - {47591591-E091-4B88-8418-74D3CBEC5712}.Debug|Any CPU.Build.0 = Debug|x64 - {47591591-E091-4B88-8418-74D3CBEC5712}.Release|Any CPU.ActiveCfg = Release|Win32 - {47591591-E091-4B88-8418-74D3CBEC5712}.Release|Any CPU.Build.0 = Release|Win32 - {9F590CAE-542E-46BE-BEA3-03DF7BDDC705}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {9F590CAE-542E-46BE-BEA3-03DF7BDDC705}.Debug|Any CPU.Build.0 = Debug|Win32 - {9F590CAE-542E-46BE-BEA3-03DF7BDDC705}.Release|Any CPU.ActiveCfg = Release|Win32 - {9F590CAE-542E-46BE-BEA3-03DF7BDDC705}.Release|Any CPU.Build.0 = Release|Win32 - {B2E3515C-3FE0-44B9-9ABE-8584A836230F}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {B2E3515C-3FE0-44B9-9ABE-8584A836230F}.Debug|Any CPU.Build.0 = Debug|Win32 - {B2E3515C-3FE0-44B9-9ABE-8584A836230F}.Release|Any CPU.ActiveCfg = Release|Win32 - {B2E3515C-3FE0-44B9-9ABE-8584A836230F}.Release|Any CPU.Build.0 = Release|Win32 + {76759923-036B-4D7B-A79C-332698CDC6A8}.Debug|x64.ActiveCfg = Debug|x64 + {76759923-036B-4D7B-A79C-332698CDC6A8}.Debug|x64.Build.0 = Debug|x64 + {76759923-036B-4D7B-A79C-332698CDC6A8}.Release|x64.ActiveCfg = Release|x64 + {76759923-036B-4D7B-A79C-332698CDC6A8}.Release|x64.Build.0 = Release|x64 + {47591591-E091-4B88-8418-74D3CBEC5712}.Debug|x64.ActiveCfg = Debug|x64 + {47591591-E091-4B88-8418-74D3CBEC5712}.Debug|x64.Build.0 = Debug|x64 + {47591591-E091-4B88-8418-74D3CBEC5712}.Release|x64.ActiveCfg = Release|x64 + {47591591-E091-4B88-8418-74D3CBEC5712}.Release|x64.Build.0 = Release|x64 + {B2E3515C-3FE0-44B9-9ABE-8584A836230F}.Debug|x64.ActiveCfg = Debug|x64 + {B2E3515C-3FE0-44B9-9ABE-8584A836230F}.Debug|x64.Build.0 = Debug|x64 + {B2E3515C-3FE0-44B9-9ABE-8584A836230F}.Release|x64.ActiveCfg = Release|x64 + {B2E3515C-3FE0-44B9-9ABE-8584A836230F}.Release|x64.Build.0 = Release|x64 + {3B7D6797-CC0C-43FA-8866-F438032E1C67}.Debug|x64.ActiveCfg = Debug|x64 + {3B7D6797-CC0C-43FA-8866-F438032E1C67}.Debug|x64.Build.0 = Debug|x64 + {3B7D6797-CC0C-43FA-8866-F438032E1C67}.Release|x64.ActiveCfg = Release|x64 + {3B7D6797-CC0C-43FA-8866-F438032E1C67}.Release|x64.Build.0 = Release|x64 + {7B9E6056-E4FB-411B-9612-A2FD679C2B69}.Debug|x64.ActiveCfg = Debug|x64 + {7B9E6056-E4FB-411B-9612-A2FD679C2B69}.Debug|x64.Build.0 = Debug|x64 + {7B9E6056-E4FB-411B-9612-A2FD679C2B69}.Release|x64.ActiveCfg = Release|x64 + {7B9E6056-E4FB-411B-9612-A2FD679C2B69}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vendor/glm/glm.props b/vendor/glm/glm.props index cc73302..7a77c28 100644 --- a/vendor/glm/glm.props +++ b/vendor/glm/glm.props @@ -1,7 +1,14 @@  + + + + + + + - $(SolutionDir)vendor/glm/glm-repo/glm/; $(AdditionalIncludeDirectories) + $(SolutionDir)vendor/glm/glm-repo/glm/; %(AdditionalIncludeDirectories) \ No newline at end of file diff --git a/vendor/sdl2/sdl2.props b/vendor/sdl2/sdl2.props index 444f218..bb6b2a6 100644 --- a/vendor/sdl2/sdl2.props +++ b/vendor/sdl2/sdl2.props @@ -1,7 +1,15 @@  + + + + + + $(SolutionDir)vendor/sdl2/SDL2-2.0.22/include/ + + - $(SolutionDir)vendor/sdl2/SDL2-2.0.22/include/; $(AdditionalIncludeDirectories) + $(SolutionDir)vendor/sdl2/SDL2-2.0.22/include/; %(AdditionalIncludeDirectories) $(SolutionDir)vendor/sdl2/SDL2-2.0.22/lib/$(Platform)