diff options
| author | Stefan Boberg <[email protected]> | 2021-11-04 14:18:54 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-11-04 14:19:05 +0100 |
| commit | 472569d4a5f2daaef7e234d93b417ccb650be624 (patch) | |
| tree | 085c33f178855ad5ffe48b01bf99d41516ffa011 /zencore | |
| parent | Merge branch 'main' of https://github.com/EpicGames/zen (diff) | |
| download | zen-472569d4a5f2daaef7e234d93b417ccb650be624.tar.xz zen-472569d4a5f2daaef7e234d93b417ccb650be624.zip | |
Renamed 3rdparty -> thirdparty for legal compliance
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/blake3.cpp | 2 | ||||
| -rw-r--r-- | zencore/compress.cpp | 2 | ||||
| -rw-r--r-- | zencore/xmake.lua | 4 | ||||
| -rw-r--r-- | zencore/zencore.vcxproj | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/zencore/blake3.cpp b/zencore/blake3.cpp index 663f21b6d..8f8952271 100644 --- a/zencore/blake3.cpp +++ b/zencore/blake3.cpp @@ -7,7 +7,7 @@ #include <zencore/testing.h> #include <zencore/zencore.h> -#include "../3rdparty/BLAKE3/c/blake3.h" +#include "../thirdparty/BLAKE3/c/blake3.h" #pragma comment(lib, "blake3.lib") #include <string.h> diff --git a/zencore/compress.cpp b/zencore/compress.cpp index 4a8d116fa..4b6d83f6f 100644 --- a/zencore/compress.cpp +++ b/zencore/compress.cpp @@ -8,7 +8,7 @@ #include <zencore/endian.h> #include <zencore/testing.h> -#include "../3rdparty/Oodle/include/oodle2.h" +#include "../thirdparty/Oodle/include/oodle2.h" #if ZEN_PLATFORM_WINDOWS # pragma comment(lib, "oo2core_win64.lib") #endif diff --git a/zencore/xmake.lua b/zencore/xmake.lua index 0b0b51758..d26a9f922 100644 --- a/zencore/xmake.lua +++ b/zencore/xmake.lua @@ -2,8 +2,8 @@ target('zencore') set_kind("static") add_files("**.cpp") add_includedirs("include", {public=true}) - add_includedirs("..\\3rdparty\\utfcpp\\source") - add_linkdirs("$(projectdir)/3rdparty/BLAKE3/lib/Win64", "$(projectdir)/3rdparty/Oodle/lib/Win64") + add_includedirs("..\\thirdparty\\utfcpp\\source") + add_linkdirs("$(projectdir)/thirdparty/BLAKE3/lib/Win64", "$(projectdir)/thirdparty/Oodle/lib/Win64") add_packages( "vcpkg::spdlog", "vcpkg::fmt", diff --git a/zencore/zencore.vcxproj b/zencore/zencore.vcxproj index 95b9eace5..49e959b96 100644 --- a/zencore/zencore.vcxproj +++ b/zencore/zencore.vcxproj @@ -74,7 +74,7 @@ <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>.\include;..\3rdparty\utfcpp\source</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\thirdparty\utfcpp\source</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <LanguageStandard>stdcpplatest</LanguageStandard> <TreatWarningAsError>true</TreatWarningAsError> @@ -95,7 +95,7 @@ <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>.\include;..\3rdparty\utfcpp\source</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\thirdparty\utfcpp\source</AdditionalIncludeDirectories> <WholeProgramOptimization>false</WholeProgramOptimization> <LanguageStandard>stdcpplatest</LanguageStandard> <TreatWarningAsError>true</TreatWarningAsError> |