diff options
| author | MITSUNARI Shigeo <herumi@nifty.com> | 2015-09-06 16:29:39 +0800 |
|---|---|---|
| committer | MITSUNARI Shigeo <herumi@nifty.com> | 2015-09-06 16:29:39 +0800 |
| commit | 71d54693061cee6dadd274ed743283a7352bddff (patch) | |
| tree | 2c7ec03a178581b56d35511b2fe03674fcef2ea7 | |
| parent | 6e37857198a058e7be1641dc120fde6701e10800 (diff) | |
| download | tangerine-mcl-71d54693061cee6dadd274ed743283a7352bddff.tar.gz tangerine-mcl-71d54693061cee6dadd274ed743283a7352bddff.tar.zst tangerine-mcl-71d54693061cee6dadd274ed743283a7352bddff.zip | |
move mcl.lib from bin to lib
| -rw-r--r-- | common.props | 4 | ||||
| -rw-r--r-- | include/mcl/fp.hpp | 4 | ||||
| -rw-r--r-- | include/mcl/op.hpp | 3 | ||||
| -rw-r--r-- | src/fp.cpp | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/common.props b/common.props index 66522a8..2b714f7 100644 --- a/common.props +++ b/common.props @@ -7,7 +7,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>$(SolutionDir)../cybozulib/include;$(SolutionDir)../cybozulib_ext/mpir/include;$(SolutionDir)include</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)../cybozulib/include;$(SolutionDir)../cybozulib_ext/mpir/include;$(SolutionDir)include;$(SolutionDir)../xbyak</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup> @@ -19,7 +19,7 @@ <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalLibraryDirectories>$(SolutionDir)../cybozulib_ext/mpir/lib;$(SolutionDir)bin</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(SolutionDir)../cybozulib_ext/mpir/lib;$(SolutionDir)lib</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <ItemGroup /> diff --git a/include/mcl/fp.hpp b/include/mcl/fp.hpp index 13643dc..31ae376 100644 --- a/include/mcl/fp.hpp +++ b/include/mcl/fp.hpp @@ -18,8 +18,8 @@ #ifdef NDEBUG #pragma comment(lib, "mcl.lib") #else -#pragma comment(lib, "mcld.lib") -#endif + #pragma comment(lib, "mcld.lib") + #endif #endif #include <cybozu/hash.hpp> #include <mcl/op.hpp> diff --git a/include/mcl/op.hpp b/include/mcl/op.hpp index e41dbb5..5305a49 100644 --- a/include/mcl/op.hpp +++ b/include/mcl/op.hpp @@ -11,6 +11,9 @@ #ifndef MCL_MAX_OP_BIT_SIZE #define MCL_MAX_OP_BIT_SIZE 521 #endif +#if !defined(MCL_DONT_USE_XBYAK) && (defined(_WIN64) || defined(__x86_64__)) + #define MCL_USE_XBYAK +#endif namespace mcl { namespace fp { @@ -76,7 +76,7 @@ struct OpeFunc { static inline void set_mpz_t(mpz_t& z, const Unit* p, int n = (int)N) { z->_mp_alloc = n; - z->_mp_size = getNonZeroArraySize(p, n); + z->_mp_size = (int)getNonZeroArraySize(p, n); z->_mp_d = (mp_limb_t*)const_cast<Unit*>(p); } static inline void set_zero(mpz_t& z, Unit *p, size_t n) |