From: Takashi Sawanaka Date: Mon, 1 Feb 2021 23:36:30 +0000 (+0900) Subject: Plugins: Fix comiplation errors X-Git-Tag: v2.16.11~115 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6511c92de7f48cc473a2487c7c59f3607a850d54;p=winmerge-jp%2Fwinmerge-jp.git Plugins: Fix comiplation errors --- diff --git a/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj b/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj index 575537e5b..6f914b2af 100644 --- a/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj +++ b/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj @@ -248,7 +248,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -291,7 +291,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -332,7 +332,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -375,7 +375,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -416,7 +416,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -459,7 +459,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -500,7 +500,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -543,7 +543,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -583,7 +583,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -627,7 +627,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -669,7 +669,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -713,7 +713,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug diff --git a/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj b/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj index 3fa063ea7..7ba6a3da0 100644 --- a/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj +++ b/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj @@ -247,7 +247,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -290,7 +290,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -331,7 +331,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -374,7 +374,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -415,7 +415,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -458,7 +458,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -498,7 +498,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -542,7 +542,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -585,7 +585,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -628,7 +628,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -668,7 +668,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -712,7 +712,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug diff --git a/Plugins/src_VCPP/IgnoreFieldsComma/WinMergeScript.cpp b/Plugins/src_VCPP/IgnoreFieldsComma/WinMergeScript.cpp index bac495377..b80241593 100644 --- a/Plugins/src_VCPP/IgnoreFieldsComma/WinMergeScript.cpp +++ b/Plugins/src_VCPP/IgnoreFieldsComma/WinMergeScript.cpp @@ -3,7 +3,7 @@ #include "IgnoreFieldsComma.h" #include "WinMergeScript.h" #include "resource.h" -#include +#include ///////////////////////////////////////////////////////////////////////////// // CWinMergeScript diff --git a/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj b/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj index 2a4addc00..e7ac22c33 100644 --- a/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj +++ b/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj @@ -247,7 +247,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -291,7 +291,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -334,7 +334,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -377,7 +377,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -418,7 +418,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -461,7 +461,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -502,7 +502,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -545,7 +545,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -585,7 +585,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -629,7 +629,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -672,7 +672,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true @@ -715,7 +715,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;WINVER=0x0501;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded true