aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMITSUNARI Shigeo <herumi@nifty.com>2016-05-10 15:51:59 +0800
committerMITSUNARI Shigeo <herumi@nifty.com>2016-05-10 15:51:59 +0800
commitbd91091efdf7f69ae7cb33ec64d689a102113f6f (patch)
tree301a9ba49782368f305765fcbdf13190294ca9b3
parente522c2d05b7d3ff02fd90e647c15c3729688330f (diff)
downloaddexon-mcl-bd91091efdf7f69ae7cb33ec64d689a102113f6f.tar.gz
dexon-mcl-bd91091efdf7f69ae7cb33ec64d689a102113f6f.tar.zst
dexon-mcl-bd91091efdf7f69ae7cb33ec64d689a102113f6f.zip
change /MD to /MT
-rw-r--r--common.props2
-rw-r--r--debug.props2
-rw-r--r--include/mcl/gmp_util.hpp28
-rw-r--r--readme.md6
-rw-r--r--release.props2
5 files changed, 10 insertions, 30 deletions
diff --git a/common.props b/common.props
index 2b714f7..94c9744 100644
--- a/common.props
+++ b/common.props
@@ -19,7 +19,7 @@
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
</ClCompile>
<Link>
- <AdditionalLibraryDirectories>$(SolutionDir)../cybozulib_ext/mpir/lib;$(SolutionDir)lib</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)../cybozulib_ext/lib;$(SolutionDir)lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
diff --git a/debug.props b/debug.props
index d261c8d..1553ae0 100644
--- a/debug.props
+++ b/debug.props
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup />
diff --git a/include/mcl/gmp_util.hpp b/include/mcl/gmp_util.hpp
index 55d200b..67cbc9e 100644
--- a/include/mcl/gmp_util.hpp
+++ b/include/mcl/gmp_util.hpp
@@ -24,33 +24,7 @@
#include <stdint.h>
#ifdef _MSC_VER
#pragma warning(pop)
-#endif
-#ifdef _MSC_VER
-#if _MSC_VER == 1900 /* VS2015 */
-#ifdef _DEBUG
-#pragma comment(lib, "14/mpird.lib")
-#pragma comment(lib, "14/mpirxxd.lib")
-#else
-#pragma comment(lib, "14/mpir.lib")
-#pragma comment(lib, "14/mpirxx.lib")
-#endif
-#elif _MSC_VER == 1800 /* VS2013 */
-#ifdef _DEBUG
-#pragma comment(lib, "12/mpird.lib")
-#pragma comment(lib, "12/mpirxxd.lib")
-#else
-#pragma comment(lib, "12/mpir.lib")
-#pragma comment(lib, "12/mpirxx.lib")
-#endif
-#else /* assume _MSC_VER == 1700 . VS2012 */
-#ifdef _DEBUG
-#pragma comment(lib, "mpird.lib")
-#pragma comment(lib, "mpirxxd.lib")
-#else
-#pragma comment(lib, "mpir.lib")
-#pragma comment(lib, "mpirxx.lib")
-#endif
-#endif
+ #include <cybozu/link_mpir.hpp>
#endif
namespace mcl {
diff --git a/readme.md b/readme.md
index ab746a2..3f597f1 100644
--- a/readme.md
+++ b/readme.md
@@ -37,6 +37,12 @@ cd mcl
make BIT=32 CFLAGS_USER="-I <lib32>/include" LDFLAGS_USER="-L <lib32>/lib -Wl,-rpath,<lib32>/lib"
```
+## Build for 64-bit Windows
+open mcl.sln and build or if you have msbuild.exe
+```
+msbuild /p:Configuration=Release
+```
+
# License
modified new BSD License
diff --git a/release.props b/release.props
index 88b0830..886ce68 100644
--- a/release.props
+++ b/release.props
@@ -5,7 +5,7 @@
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup />