diff options
| author | Martin Ridgers <[email protected]> | 2021-11-09 14:28:31 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-09 14:28:31 +0100 |
| commit | 58a70481354cb667c5c422932669a0d6f2fdc123 (patch) | |
| tree | c3985b5e58f240698a827080a4fac8d6a9fdf234 /zencore | |
| parent | Merged main (diff) | |
| parent | Renamed 3rdparty -> thirdparty for legal compliance (diff) | |
| download | zen-58a70481354cb667c5c422932669a0d6f2fdc123.tar.xz zen-58a70481354cb667c5c422932669a0d6f2fdc123.zip | |
Merged main
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/blake3.cpp | 2 | ||||
| -rw-r--r-- | zencore/compress.cpp | 2 | ||||
| -rw-r--r-- | zencore/xmake.lua | 10 | ||||
| -rw-r--r-- | zencore/zencore.vcxproj | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/zencore/blake3.cpp b/zencore/blake3.cpp index 5869f19a3..b2019d4e2 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" #if ZEN_PLATFORM_WINDOWS # pragma comment(lib, "blake3.lib") #endif diff --git a/zencore/compress.cpp b/zencore/compress.cpp index dd6484a3c..a1a6731ff 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 218f299d7..313e41c74 100644 --- a/zencore/xmake.lua +++ b/zencore/xmake.lua @@ -2,13 +2,13 @@ target('zencore') set_kind("static") add_files("**.cpp") add_includedirs("include", {public=true}) - add_includedirs("$(projectdir)/3rdparty/utfcpp/source") + add_includedirs("$(projectdir)/thirdparty/utfcpp/source") if is_os("windows") then - add_linkdirs("$(projectdir)/3rdparty/BLAKE3/lib/Win64") - add_linkdirs("$(projectdir)/3rdparty/Oodle/lib/Win64") + add_linkdirs("$(projectdir)/thirdparty/BLAKE3/lib/Win64") + add_linkdirs("$(projectdir)/thirdparty/Oodle/lib/Win64") elseif is_os("linux") then - add_linkdirs("$(projectdir)/3rdparty/BLAKE3/lib/Linux_x64") - add_linkdirs("$(projectdir)/3rdparty/Oodle/lib/Linux_x64") + add_linkdirs("$(projectdir)/thirdparty/BLAKE3/lib/Linux_x64") + add_linkdirs("$(projectdir)/thirdparty/Oodle/lib/Linux_x64") add_links("blake3") add_links("oo2corelinux64") add_links("pthread") 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> |