From c22e92d210ccc2e9bb27579c92dd7336c2abfb8a Mon Sep 17 00:00:00 2001 From: yumetodo Date: Sun, 3 Apr 2016 20:52:58 +0900 Subject: [PATCH 1/3] support Visual Studio 2013, 2015 --- 00am.vcxproj | 11 +++++------ vcxcompat.props | 12 ++++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 vcxcompat.props diff --git a/00am.vcxproj b/00am.vcxproj index 1e6cb7d..36f051a 100644 --- a/00am.vcxproj +++ b/00am.vcxproj @@ -18,15 +18,14 @@ {BB1F21AB-35C8-4474-AD0E-5138023DCD7C} + DynamicLibrary - v110 false MultiByte DynamicLibrary - v110 false MultiByte @@ -57,7 +56,7 @@ MaxSpeed OnlyExplicitInline - .;7z;C:\Program Files (x86)\Library\boost\boost_1_54_0;%(AdditionalIncludeDirectories) + .;7z;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_WIN32_WINNT=0x0501;NDEBUG;_WINDOWS;_USRDLL;MY00AM_EXPORTS;EXTERNAL_CODECS;%(PreprocessorDefinitions) true MultiThreaded @@ -76,7 +75,7 @@ comctl32.lib;version.lib;%(AdditionalDependencies) Release/ax7z.spi true - C:\Program Files (x86)\Library\boost\boost_1_54_0\lib32-msvc-11.0;%(AdditionalLibraryDirectories) + $(BOOST_ROOT)/stage/lib;%(AdditionalLibraryDirectories) .\ax7z.def .\Release/ax7z.pdb .\Release/ax7z.lib @@ -98,7 +97,7 @@ Disabled - .;7z;C:\Program Files (x86)\Library\boost\boost_1_54_0;%(AdditionalIncludeDirectories) + .;7z;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_WIN32_WINNT=0x0501;_DEBUG;_WINDOWS;_USRDLL;MY00AM_EXPORTS;EXTERNAL_CODECS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -118,7 +117,7 @@ comctl32.lib;version.lib;%(AdditionalDependencies) $(OutDir)ax7z.spi true - C:\Program Files (x86)\Library\boost\boost_1_54_0\lib32-msvc-11.0;%(AdditionalLibraryDirectories) + $(BOOST_ROOT)/stage/lib;%(AdditionalLibraryDirectories) .\ax7z.def true .\Debug/ax7z.pdb diff --git a/vcxcompat.props b/vcxcompat.props new file mode 100644 index 0000000..2432263 --- /dev/null +++ b/vcxcompat.props @@ -0,0 +1,12 @@ + + + + v110 + + + v120 + + + v140 + + From 91fd7070e09bacfc57f4481d1754c782e15438ae Mon Sep 17 00:00:00 2001 From: yumetodo Date: Sun, 3 Apr 2016 21:59:51 +0900 Subject: [PATCH 2/3] update .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index a5cbcd9..d92ab15 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ /dist.sh *.BAK release.h +/.vs +*.VC.db +*.opendb From 72a472c524402519d0abd748c18ffae7c2827be6 Mon Sep 17 00:00:00 2001 From: yumetodo Date: Sun, 3 Apr 2016 22:00:04 +0900 Subject: [PATCH 3/3] fix Linker error --- 00am.vcxproj | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/00am.vcxproj b/00am.vcxproj index 36f051a..c6168bf 100644 --- a/00am.vcxproj +++ b/00am.vcxproj @@ -16,6 +16,7 @@ .. MSSCCI:Microsoft Visual SourceSafe {BB1F21AB-35C8-4474-AD0E-5138023DCD7C} + 8.1 @@ -43,14 +44,18 @@ <_ProjectFileVersion>11.0.50727.1 - .\Release\ - .\Release\ + $(Configuration)\ + $(Configuration)\ false + .spi + ax7z - .\Debug\ - .\Debug\ + $(Configuration)\ + $(Configuration)\ false + .spi + ax7z @@ -73,7 +78,7 @@ comctl32.lib;version.lib;%(AdditionalDependencies) - Release/ax7z.spi + $(OutDir)$(TargetName)$(TargetExt) true $(BOOST_ROOT)/stage/lib;%(AdditionalLibraryDirectories) .\ax7z.def @@ -110,12 +115,12 @@ true Level3 true - EditAndContinue + ProgramDatabase Default comctl32.lib;version.lib;%(AdditionalDependencies) - $(OutDir)ax7z.spi + $(OutDir)$(TargetName)$(TargetExt) true $(BOOST_ROOT)/stage/lib;%(AdditionalLibraryDirectories) .\ax7z.def