From ff83132a7a6387877e6c92b76e2bf398411666c5 Mon Sep 17 00:00:00 2001 From: Niklas Rosenstein Date: Fri, 27 Dec 2019 11:01:02 +0100 Subject: [PATCH] R21 fix, point to fork of hash-library until https://github.com/stbrumme/hash-library/pull/4 is merged --- .gitmodules | 7 ++----- build.craftr | 2 +- build.craftr.toml | 2 ++ craftr/net.maxon.c4d | 1 - source/Utils/Misc.h | 5 +---- vendor/hash-library | 2 +- vendor/net.maxon.c4d | 1 + 7 files changed, 8 insertions(+), 12 deletions(-) delete mode 160000 craftr/net.maxon.c4d create mode 160000 vendor/net.maxon.c4d diff --git a/.gitmodules b/.gitmodules index 49e930e..a5322a3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ -[submodule "craftr\\modules\\lib.cxx.maxon.c4d"] - path = craftr\\modules\\lib.cxx.maxon.c4d - url = https://github.com/craftr-build/lib.cxx.maxon.c4d.git [submodule "craftr/net.maxon.c4d"] - path = craftr/net.maxon.c4d + path = vendor/net.maxon.c4d url = https://github.com/craftr-build/net.maxon.c4d.git [submodule "vendor/hash-library"] path = vendor/hash-library - url = https://github.com/stbrumme/hash-library.git + url = https://github.com/NiklasRosenstein/hash-library.git diff --git a/build.craftr b/build.craftr index 9409019..392f932 100644 --- a/build.craftr +++ b/build.craftr @@ -1,6 +1,6 @@ import * from 'craftr' project('com.niklasrosenstein.c4d-container-object', '1.1-0') -link_module('./craftr/net.maxon.c4d') +link_module('./vendor/net.maxon.c4d') import c4d from 'net.maxon.c4d' target('plugin') diff --git a/build.craftr.toml b/build.craftr.toml index 8db0ebe..4c9cae3 100644 --- a/build.craftr.toml +++ b/build.craftr.toml @@ -1,3 +1,5 @@ [msvc] version = "140" +[c4d] +release = "21.115" diff --git a/craftr/net.maxon.c4d b/craftr/net.maxon.c4d deleted file mode 160000 index 4b2c68a..0000000 --- a/craftr/net.maxon.c4d +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4b2c68a46c2cb3697747bed83ba02e1ddc666041 diff --git a/source/Utils/Misc.h b/source/Utils/Misc.h index af5b9de..4704b36 100644 --- a/source/Utils/Misc.h +++ b/source/Utils/Misc.h @@ -11,6 +11,7 @@ #include "sha256.h" #include #include +#include #if API_VERSION < 15000 namespace maxon { @@ -18,10 +19,6 @@ namespace maxon { } #endif -#if API_VERSION >= 20000 - #define STRINGENCODING_UTF8 STRINGENCODING::UTF8 -#endif - /// *************************************************************************** /// Hashes a Cinema 4D string and returns a number as a string. /// *************************************************************************** diff --git a/vendor/hash-library b/vendor/hash-library index a8a88f8..56e53ed 160000 --- a/vendor/hash-library +++ b/vendor/hash-library @@ -1 +1 @@ -Subproject commit a8a88f8acbdd97b854b6ac61e53177dc7870f32f +Subproject commit 56e53ed18280a23878e1292a5121baec69495315 diff --git a/vendor/net.maxon.c4d b/vendor/net.maxon.c4d new file mode 160000 index 0000000..da43a05 --- /dev/null +++ b/vendor/net.maxon.c4d @@ -0,0 +1 @@ +Subproject commit da43a05571c5bc14375dd5664b1801f7b95d1cb8