Skip to content

Commit

Permalink
R21 fix, point to fork of hash-library until stbrumme/hash-library#4
Browse files Browse the repository at this point in the history
…is merged
  • Loading branch information
NiklasRosenstein committed Dec 27, 2019
1 parent 0e130cb commit ff83132
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 12 deletions.
7 changes: 2 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build.craftr
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 2 additions & 0 deletions build.craftr.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[msvc]
version = "140"

[c4d]
release = "21.115"
1 change: 0 additions & 1 deletion craftr/net.maxon.c4d
Submodule net.maxon.c4d deleted from 4b2c68
5 changes: 1 addition & 4 deletions source/Utils/Misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,14 @@
#include "sha256.h"
#include <c4d.h>
#include <c4d_legacy.h>
#include <c4d_apibridge.h>

#if API_VERSION < 15000
namespace maxon {
using namespace c4d_misc;
}
#endif

#if API_VERSION >= 20000
#define STRINGENCODING_UTF8 STRINGENCODING::UTF8
#endif

/// ***************************************************************************
/// Hashes a Cinema 4D string and returns a number as a string.
/// ***************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion vendor/hash-library
1 change: 1 addition & 0 deletions vendor/net.maxon.c4d
Submodule net.maxon.c4d added at da43a0

0 comments on commit ff83132

Please sign in to comment.