• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision12778 (tree)
Zeit2008-04-26 02:44:43
Autorstefankueng

Log Message

Make sure we use the new CRT and MFC dlls and get the correct manifest for those in our binaries.

Ändern Zusammenfassung

Diff

--- trunk/ext/ResizableLib/StdAfx.h (revision 12777)
+++ trunk/ext/ResizableLib/StdAfx.h (revision 12778)
@@ -39,6 +39,8 @@
3939 #define _SECURE_SCL_DEPRECATE 0
4040 #define _HAS_ITERATOR_DEBUGGING 0
4141
42+#define _BIND_TO_CURRENT_CRT_VERSION 1
43+
4244 #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
4345
4446 #include <afxwin.h> // MFC core and standard components
--- trunk/src/LogCache/stdafx.h (revision 12777)
+++ trunk/src/LogCache/stdafx.h (revision 12778)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2007-2007 - TortoiseSVN
3+// Copyright (C) 2007-2008 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -36,6 +36,8 @@
3636 #define _WIN32_IE 0x0501
3737 #endif
3838
39+#define _BIND_TO_CURRENT_CRT_VERSION 1
40+
3941 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
4042
4143 // turns off MFC's hiding of some common and often safely ignored warning messages
--- trunk/src/ResText/stdafx.h (revision 12777)
+++ trunk/src/ResText/stdafx.h (revision 12778)
@@ -4,6 +4,7 @@
44 //
55
66 #pragma once
7+#define _BIND_TO_CURRENT_CRT_VERSION 1
78
89 #pragma warning(push)
910 #pragma warning(disable: 4702) // Unreachable code warnings in xtree
--- trunk/src/SubWCRev/stdafx.h (revision 12777)
+++ trunk/src/SubWCRev/stdafx.h (revision 12778)
@@ -7,6 +7,8 @@
77
88 #define _WIN32_WINNT 0x501
99
10+#define _BIND_TO_CURRENT_CRT_VERSION 1
11+
1012 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
1113 #include <WinSock2.h>
1214 #include <Ws2tcpip.h>
--- trunk/src/TSVNCache/stdafx.h (revision 12777)
+++ trunk/src/TSVNCache/stdafx.h (revision 12778)
@@ -8,6 +8,8 @@
88 #define _WIN32_IE 0x600
99 #define _WIN32_WINNT 0x0600
1010
11+#define _BIND_TO_CURRENT_CRT_VERSION 1
12+
1113 #include <tchar.h>
1214 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
1315
--- trunk/src/TortoiseBlame/stdafx.h (revision 12777)
+++ trunk/src/TortoiseBlame/stdafx.h (revision 12778)
@@ -8,6 +8,9 @@
88
99 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
1010 #define _WIN32_WINNT 0x0500
11+
12+#define _BIND_TO_CURRENT_CRT_VERSION 1
13+
1114 // Windows Header Files:
1215 #include <windows.h>
1316 // C RunTime Header Files
--- trunk/src/TortoiseIDiff/stdafx.h (revision 12777)
+++ trunk/src/TortoiseIDiff/stdafx.h (revision 12778)
@@ -23,6 +23,8 @@
2323 #define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
2424 #endif
2525
26+#define _BIND_TO_CURRENT_CRT_VERSION 1
27+
2628 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
2729 // Windows Header Files:
2830 #include <windows.h>
--- trunk/src/TortoiseMerge/stdafx.h (revision 12777)
+++ trunk/src/TortoiseMerge/stdafx.h (revision 12778)
@@ -26,6 +26,9 @@
2626 #define _WIN32_IE 0x0500 // Change this to the appropriate value to target IE 5.0 or later.
2727 #endif
2828
29+#define _BIND_TO_CURRENT_CRT_VERSION 1
30+#define _BIND_TO_CURRENT_MFC_VERSION 1
31+
2932 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
3033
3134 // turns off MFC's hiding of some common and often safely ignored warning messages
--- trunk/src/TortoiseOverlays/stdafx.h (revision 12777)
+++ trunk/src/TortoiseOverlays/stdafx.h (revision 12778)
@@ -1,5 +1,5 @@
11 // TortoiseOverlays - an overlay handler for Tortoise clients
2-// Copyright (C) 2007 - TortoiseSVN
2+// Copyright (C) 2007-2008 - TortoiseSVN
33
44 #pragma once
55 // Modify the following defines if you have to target a platform prior to the ones specified below.
@@ -20,6 +20,8 @@
2020 # define _WIN32_IE 0x0500 // Change this to the appropriate value to target IE 5.0 or later.
2121 #endif
2222
23+#define _BIND_TO_CURRENT_CRT_VERSION 1
24+
2325 #define ISOLATION_AWARE_ENABLED 1
2426
2527 #include <windows.h>
--- trunk/src/TortoiseProc/stdafx.h (revision 12777)
+++ trunk/src/TortoiseProc/stdafx.h (revision 12778)
@@ -23,6 +23,8 @@
2323 #define _WIN32_IE 0x0501
2424 #endif
2525
26+#define _BIND_TO_CURRENT_CRT_VERSION 1
27+#define _BIND_TO_CURRENT_MFC_VERSION 1
2628
2729 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
2830
--- trunk/src/TortoiseSVNSetup/CustomActions/stdafx.h (revision 12777)
+++ trunk/src/TortoiseSVNSetup/CustomActions/stdafx.h (revision 12778)
@@ -5,6 +5,7 @@
55
66 #pragma once
77
8+#define _BIND_TO_CURRENT_CRT_VERSION 1
89
910 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
1011 // Windows Header Files:
--- trunk/src/TortoiseShell/stdafx.h (revision 12777)
+++ trunk/src/TortoiseShell/stdafx.h (revision 12778)
@@ -21,6 +21,8 @@
2121 # define _WIN32_IE 0x0500 // Change this to the appropriate value to target IE 5.0 or later.
2222 #endif
2323
24+#define _BIND_TO_CURRENT_CRT_VERSION 1
25+
2426 #define ISOLATION_AWARE_ENABLED 1
2527
2628 #include <WinSock2.h>
--- trunk/src/TortoiseUDiff/stdafx.h (revision 12777)
+++ trunk/src/TortoiseUDiff/stdafx.h (revision 12778)
@@ -23,6 +23,8 @@
2323 #define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
2424 #endif
2525
26+#define _BIND_TO_CURRENT_CRT_VERSION 1
27+
2628 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
2729 // Windows Header Files:
2830 #include <windows.h>
--- trunk/src/crashrpt/StdAfx.h (revision 12777)
+++ trunk/src/crashrpt/StdAfx.h (revision 12778)
@@ -4,6 +4,7 @@
44 #define WINVER 0x0400
55 #define _WIN32_WINNT 0x0400
66 #define _WIN32_IE 0x0400
7+#define _BIND_TO_CURRENT_CRT_VERSION 1
78 #include <Windows.h>
89 #include <tchar.h>
910 #include <oleauto.h>
Show on old repository browser