move mcl.lib from bin to lib

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 />

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>

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 {
 

src/fp.cpp

@@ -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)