OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 41d9dff)
*.vcxproj: Apply GreyMerlin's changes
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 26 Mar 2017 05:31:09 +0000 (14:31 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 26 Mar 2017 05:31:09 +0000 (14:31 +0900)
Src/Merge.vcxproj patch | blob | history
Src/MergeLang.vcxproj patch | blob | history
Testing/GoogleTest/UnitTests/UnitTests.vcxproj patch | blob | history

diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index 85cc6d5..31b9082 100644 (file)
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -54,19 +54,15 @@
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
@@ -116,6 +112,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>Default</CompileAs>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -126,7 +124,7 @@
       <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <AdditionalLibraryDirectories>..\Build\expat;..\Build\scew;..\Build\heksedit;..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
@@ -172,6 +170,8 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -182,7 +182,7 @@
       <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <AdditionalLibraryDirectories>..\Build\expat\X64;..\Build\scew\X64;..\Build\heksedit\X64;..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
@@ -224,6 +224,8 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <CompileAs>Default</CompileAs>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -233,7 +235,7 @@
       <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <AdditionalLibraryDirectories>..\Build\expat;..\Build\scew;..\Build\heksedit;..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
@@ -242,6 +244,7 @@
       </DataExecutionPrevention>\r
       <TargetMachine>MachineX86</TargetMachine>\r
       <GenerateMapFile>true</GenerateMapFile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
     </Link>\r
     <PostBuildEvent>\r
       <Command>\r
@@ -274,8 +277,10 @@
       <BrowseInformation>true</BrowseInformation>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -285,7 +290,7 @@
       <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <AdditionalLibraryDirectories>..\Build\expat\X64;..\Build\scew\X64;..\Build\heksedit\X64;..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
@@ -294,7 +299,8 @@
       </DataExecutionPrevention>\r
       <TargetMachine>MachineX64</TargetMachine>\r
       <GenerateMapFile>true</GenerateMapFile>\r
-      <Profile>true</Profile>\r
+      <Profile>false</Profile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
     </Link>\r
     <PostBuildEvent>\r
       <Command>\r
diff --git a/Src/MergeLang.vcxproj b/Src/MergeLang.vcxproj
index f239a08..f45d8cf 100644 (file)
--- a/Src/MergeLang.vcxproj
+++ b/Src/MergeLang.vcxproj
@@ -27,22 +27,22 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
+    <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v120_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
+    <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v120</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
+    <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v120_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
+    <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v120</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
@@ -50,19 +50,15 @@
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
@@ -112,23 +108,8 @@
       <Command>pushd $(ProjectDir)..\Translations\WinMerge\r
 cscript UpdatePoFilesFromPotFile.vbs\r
 popd\r
-mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeUnicodeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeUnicodeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeUnicodeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeUnicodeRelease\Languages\"\r
-</Command>\r
+mkdir $(OutDir)\Languages\ 2&gt; NUL\r
+copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(OutDir)\Languages\"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">\r
@@ -166,23 +147,8 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
       <Command>pushd $(ProjectDir)..\Translations\WinMerge\r
 cscript UpdatePoFilesFromPotFile.vbs\r
 popd\r
-mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeUnicodeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeUnicodeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeUnicodeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeUnicodeRelease\Languages\"\r
-</Command>\r
+mkdir $(OutDir)\Languages\ 2&gt; NUL\r
+copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(OutDir)\Languages\"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">\r
@@ -215,22 +181,8 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
       <Command>pushd $(ProjectDir)..\Translations\WinMerge\r
 cscript UpdatePoFilesFromPotFile.vbs\r
 popd\r
-mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeUnicodeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeUnicodeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeUnicodeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeUnicodeRelease\Languages\"\r
+mkdir $(OutDir)\Languages\ 2&gt; NUL\r
+copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(OutDir)\Languages\"\r
 </Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
@@ -267,23 +219,8 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
       <Command>pushd $(ProjectDir)..\Translations\WinMerge\r
 cscript UpdatePoFilesFromPotFile.vbs\r
 popd\r
-mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL\r
-mkdir $(ProjectDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeUnicodeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\MergeUnicodeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeRelease\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeUnicodeDebug\Languages\"\r
-copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\MergeUnicodeRelease\Languages\"\r
-</Command>\r
+mkdir $(OutDir)\Languages\ 2&gt; NUL\r
+copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(OutDir)\Languages\"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
diff --git a/Testing/GoogleTest/UnitTests/UnitTests.vcxproj b/Testing/GoogleTest/UnitTests/UnitTests.vcxproj
index 2a83d01..a371f8d 100644 (file)
--- a/Testing/GoogleTest/UnitTests/UnitTests.vcxproj
+++ b/Testing/GoogleTest/UnitTests/UnitTests.vcxproj
@@ -21,6 +21,7 @@
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
+    <ProjectName>UnitTests</ProjectName>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -87,7 +88,6 @@
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\gtest\include;..\..\..\Externals\gtest\;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UNICODE;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>\r
@@ -95,6 +95,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -104,6 +105,7 @@
       <ProgramDatabaseFile>$(OutDir)UnitTests.pdb</ProgramDatabaseFile>\r
       <SubSystem>Console</SubSystem>\r
       <TargetMachine>MachineX86</TargetMachine>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
@@ -118,6 +120,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -138,6 +141,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -148,6 +152,7 @@
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <TargetMachine>MachineX86</TargetMachine>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
@@ -160,6 +165,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
About OSDN
Find Software
Develop Software
Help