From e4e2e5f75b1b78b250c2de10103174a0c6a1ccb1 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 13 Jan 2013 12:51:13 +0100 Subject: [PATCH] Use global targetver.h Signed-off-by: Sven Strickroth --- src/SshAskPass/SshAskPass.rc | 4 ++-- src/SshAskPass/SshAskPass.vcxproj | 1 - src/SshAskPass/SshAskPass.vcxproj.filters | 3 --- src/SshAskPass/stdafx.h | 2 +- src/SshAskPass/targetver.h | 24 ------------------------ src/touch/stdafx.h | 2 +- src/touch/targetver.h | 24 ------------------------ src/touch/touch.rc | 4 ++-- src/touch/touch.vcxproj | 1 - src/touch/touch.vcxproj.filters | 3 --- 10 files changed, 6 insertions(+), 62 deletions(-) delete mode 100644 src/SshAskPass/targetver.h delete mode 100644 src/touch/targetver.h diff --git a/src/SshAskPass/SshAskPass.rc b/src/SshAskPass/SshAskPass.rc index cec10e0c2..7dfc2a803 100644 --- a/src/SshAskPass/SshAskPass.rc +++ b/src/SshAskPass/SshAskPass.rc @@ -8,7 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #ifndef APSTUDIO_INVOKED -#include "targetver.h" +#include "..\targetver.h" #endif #define APSTUDIO_HIDDEN_SYMBOLS #include @@ -83,7 +83,7 @@ END 2 TEXTINCLUDE BEGIN "#ifndef APSTUDIO_INVOKED\r\n" - "#include ""targetver.h""\r\n" + "#include ""..\\targetver.h""\r\n" "#endif\r\n" "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" "#include \r\n" diff --git a/src/SshAskPass/SshAskPass.vcxproj b/src/SshAskPass/SshAskPass.vcxproj index 368678f49..a7aaea3e5 100644 --- a/src/SshAskPass/SshAskPass.vcxproj +++ b/src/SshAskPass/SshAskPass.vcxproj @@ -88,7 +88,6 @@ - diff --git a/src/SshAskPass/SshAskPass.vcxproj.filters b/src/SshAskPass/SshAskPass.vcxproj.filters index c760172a4..1c7e19f14 100644 --- a/src/SshAskPass/SshAskPass.vcxproj.filters +++ b/src/SshAskPass/SshAskPass.vcxproj.filters @@ -29,9 +29,6 @@ Header Files - - Header Files - diff --git a/src/SshAskPass/stdafx.h b/src/SshAskPass/stdafx.h index 5a1979b70..a3a2a14a2 100644 --- a/src/SshAskPass/stdafx.h +++ b/src/SshAskPass/stdafx.h @@ -5,7 +5,7 @@ #pragma once -#include "targetver.h" +#include "..\targetver.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers // Windows Header Files: diff --git a/src/SshAskPass/targetver.h b/src/SshAskPass/targetver.h deleted file mode 100644 index f583181df..000000000 --- a/src/SshAskPass/targetver.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -// The following macros define the minimum required platform. The minimum required platform -// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run -// your application. The macros work by enabling all features available on platform versions up to and -// including the version specified. - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. -#ifndef WINVER // Specifies that the minimum required platform is Windows Vista. -#define WINVER 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0. -#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE. -#endif diff --git a/src/touch/stdafx.h b/src/touch/stdafx.h index 3e856124d..bb398d220 100644 --- a/src/touch/stdafx.h +++ b/src/touch/stdafx.h @@ -5,7 +5,7 @@ #pragma once -#include "targetver.h" +#include "..\targetver.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers // Windows Header Files: diff --git a/src/touch/targetver.h b/src/touch/targetver.h deleted file mode 100644 index f583181df..000000000 --- a/src/touch/targetver.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -// The following macros define the minimum required platform. The minimum required platform -// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run -// your application. The macros work by enabling all features available on platform versions up to and -// including the version specified. - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. -#ifndef WINVER // Specifies that the minimum required platform is Windows Vista. -#define WINVER 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0. -#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE. -#endif diff --git a/src/touch/touch.rc b/src/touch/touch.rc index 793aa31a0..4f1b045db 100644 --- a/src/touch/touch.rc +++ b/src/touch/touch.rc @@ -8,7 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #ifndef APSTUDIO_INVOKED -#include "targetver.h" +#include "..\targetver.h" #endif #define APSTUDIO_HIDDEN_SYMBOLS #include @@ -110,7 +110,7 @@ END 2 TEXTINCLUDE BEGIN "#ifndef APSTUDIO_INVOKED\r\n" - "#include ""targetver.h""\r\n" + "#include ""..\\targetver.h""\r\n" "#endif\r\n" "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" "#include \r\n" diff --git a/src/touch/touch.vcxproj b/src/touch/touch.vcxproj index 9765c8c07..36086a754 100644 --- a/src/touch/touch.vcxproj +++ b/src/touch/touch.vcxproj @@ -88,7 +88,6 @@ - diff --git a/src/touch/touch.vcxproj.filters b/src/touch/touch.vcxproj.filters index 39b56dd7d..c69a8efea 100644 --- a/src/touch/touch.vcxproj.filters +++ b/src/touch/touch.vcxproj.filters @@ -29,9 +29,6 @@ Header Files - - Header Files - -- 2.11.4.GIT