From 2034493de18a0d98edf4e055b560c22676566f0e Mon Sep 17 00:00:00 2001 From: MITSUNARI Shigeo Date: Mon, 3 Apr 2017 11:52:53 +0900 Subject: add vcproj files --- bls.sln | 30 ++++++++++++ common.props | 26 +++++++++++ debug.props | 14 ++++++ include/bls.hpp | 1 + mk.bat | 8 +++- mklib.bat | 10 ++-- release.props | 12 +++++ setvar.bat | 3 ++ src/proj/bls.vcxproj | 92 +++++++++++++++++++++++++++++++++++++ test/proj/bls_test/bls_test.vcxproj | 88 +++++++++++++++++++++++++++++++++++ 10 files changed, 278 insertions(+), 6 deletions(-) create mode 100644 bls.sln create mode 100644 common.props create mode 100644 debug.props create mode 100644 release.props create mode 100755 setvar.bat create mode 100644 src/proj/bls.vcxproj create mode 100644 test/proj/bls_test/bls_test.vcxproj diff --git a/bls.sln b/bls.sln new file mode 100644 index 0000000..6f0a793 --- /dev/null +++ b/bls.sln @@ -0,0 +1,30 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bls_test", "test\proj\bls_test\bls_test.vcxproj", "{51266DE6-B57B-4AE3-B85C-282F170E1728}" + ProjectSection(ProjectDependencies) = postProject + {1DBB979A-C212-45CD-9563-446A96F87F71} = {1DBB979A-C212-45CD-9563-446A96F87F71} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bls", "src\proj\bls.vcxproj", "{1DBB979A-C212-45CD-9563-446A96F87F71}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {51266DE6-B57B-4AE3-B85C-282F170E1728}.Debug|x64.ActiveCfg = Debug|x64 + {51266DE6-B57B-4AE3-B85C-282F170E1728}.Debug|x64.Build.0 = Debug|x64 + {51266DE6-B57B-4AE3-B85C-282F170E1728}.Release|x64.ActiveCfg = Release|x64 + {51266DE6-B57B-4AE3-B85C-282F170E1728}.Release|x64.Build.0 = Release|x64 + {1DBB979A-C212-45CD-9563-446A96F87F71}.Debug|x64.ActiveCfg = Debug|x64 + {1DBB979A-C212-45CD-9563-446A96F87F71}.Debug|x64.Build.0 = Debug|x64 + {1DBB979A-C212-45CD-9563-446A96F87F71}.Release|x64.ActiveCfg = Release|x64 + {1DBB979A-C212-45CD-9563-446A96F87F71}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/common.props b/common.props new file mode 100644 index 0000000..d6fdbb9 --- /dev/null +++ b/common.props @@ -0,0 +1,26 @@ + + + + + + $(SolutionDir)bin\ + + + + $(SolutionDir)../cybozulib/include;$(SolutionDir)../cybozulib_ext/include;$(SolutionDir)include;$(SolutionDir)../mcl/include + + + + + Level4 + MultiThreaded + + + _MBCS;%(PreprocessorDefinitions);NOMINMAX;BLS_MAX_OP_UNIT_SIZE=6 + + + $(SolutionDir)../cybozulib_ext/lib;$(SolutionDir)../mcl/lib;$(SolutionDir)lib + + + + diff --git a/debug.props b/debug.props new file mode 100644 index 0000000..1553ae0 --- /dev/null +++ b/debug.props @@ -0,0 +1,14 @@ + + + + + + $(ProjectName)d + + + + MultiThreadedDebug + + + + \ No newline at end of file diff --git a/include/bls.hpp b/include/bls.hpp index b7c77a6..7b2a673 100644 --- a/include/bls.hpp +++ b/include/bls.hpp @@ -15,6 +15,7 @@ #include #ifdef _MSC_VER + #pragma comment(lib, "mcl.lib") #pragma comment(lib, "bls.lib") #endif diff --git a/mk.bat b/mk.bat index ae07b68..d590524 100644 --- a/mk.bat +++ b/mk.bat @@ -1,2 +1,8 @@ @echo off -cl /DNOMINMAX /Ox /DNDEBUG /W4 /Zi /EHsc -I ./include -I../mcl/include -I../cybozulib/include -I../cybozulib_ext/include -DBLS_MAX_OP_UNIT_SIZE=4 %1 %2 %3 /link /LIBPATH:..\cybozulib_ext\lib /LIBPATH:.\lib /LIBPATH:..\mcl\lib +call setvar.bat +set SRC=%1 +set EXE=%SRC:.cpp=.exe% +set EXE=%EXE:.c=.exe% +set EXE=%EXE:test\=bin\% +set EXE=%EXE:sample\=bin\% +cl %CFLAGS% %1 %2 %3 /Fe:%EXE% /link %LDFLAGS% diff --git a/mklib.bat b/mklib.bat index 87e7902..52b61d9 100644 --- a/mklib.bat +++ b/mklib.bat @@ -1,8 +1,8 @@ @echo off +call setvar.bat echo make bls.lib -set OPT=/DNOMINMAX /Ox /DNDEBUG /W4 /Zi /EHsc /c -I./include -I../mcl/include -I../cybozulib/include -I../cybozulib_ext/include -cl %OPT% -DBLS_MAX_OP_UNIT_SIZE=4 src\bls.cpp -lib /OUT:lib\bls.lib /nodefaultlib bls.obj +cl /c %CFLAGS% src\bls.cpp +lib /OUT:lib\bls.lib /nodefaultlib bls.obj %LDFLAGS% echo make lib_if.lib -cl %OPT% -DBLS_MAX_OP_UNIT_SIZE=4 src\bls_if.cpp -lib /OUT:lib\bls_if.lib /nodefaultlib bls_if.obj +cl /c %CFLAGS% src\bls_if.cpp +lib /OUT:lib\bls_if.lib /nodefaultlib bls_if.obj %LDFLAGS% diff --git a/release.props b/release.props new file mode 100644 index 0000000..886ce68 --- /dev/null +++ b/release.props @@ -0,0 +1,12 @@ + + + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/setvar.bat b/setvar.bat new file mode 100755 index 0000000..ccaf5bc --- /dev/null +++ b/setvar.bat @@ -0,0 +1,3 @@ +set CFLAGS=/MT /DNOMINMAX /Ox /DNDEBUG /W4 /Zi /EHsc /nologo -I ./include -I../cybozulib/include -I../cybozulib_ext/include -I../mcl/include +set CFLAGS=%CFLAGS% -DBLS_MAX_OP_UNIT_SIZE=6 +set LDFLAGS=/LIBPATH:..\cybozulib_ext\lib /LIBPATH:.\lib /LIBPATH:..\mcl\lib diff --git a/src/proj/bls.vcxproj b/src/proj/bls.vcxproj new file mode 100644 index 0000000..d8df87e --- /dev/null +++ b/src/proj/bls.vcxproj @@ -0,0 +1,92 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {1DBB979A-C212-45CD-9563-446A96F87F71} + Win32Proj + ec_test + + + + StaticLibrary + true + v140 + MultiByte + + + StaticLibrary + false + v140 + true + MultiByte + + + + + + + + + + + + + + + + + true + .lib + $(SolutionDir)lib\ + + + false + .lib + $(SolutionDir)lib\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + + + \ No newline at end of file diff --git a/test/proj/bls_test/bls_test.vcxproj b/test/proj/bls_test/bls_test.vcxproj new file mode 100644 index 0000000..79da51a --- /dev/null +++ b/test/proj/bls_test/bls_test.vcxproj @@ -0,0 +1,88 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {51266DE6-B57B-4AE3-B85C-282F170E1728} + Win32Proj + fp_test + + + + Application + true + v140 + MultiByte + + + Application + false + v140 + true + MultiByte + + + + + + + + + + + + + + + + + true + + + false + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + + + \ No newline at end of file -- cgit v1.2.3