vcpkg/ports/crashrpt/002-fix-wtl-includepath.patch
Lily Wang e47ff308b0
[crashrpt] Fix build error ()
* [crashrpt] Fix build error

* x-add-version

* fix build error

* add license

* x-add-version

* Correct license

Co-authored-by: Billy O'Neal <bion@microsoft.com>
2022-08-09 13:58:37 -07:00

149 lines
3.8 KiB
Diff

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed9e3d3..d842aa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ if(NOT TINYXML_INCLUDE_DIR)
message(FATAL_ERROR "tinyxml include dir not found")
endif()
-find_path(WTL_INCLUDE_DIR wtl/atlapp.h)
+find_path(WTL_INCLUDE_DIR atlapp.h)
if(NOT WTL_INCLUDE_DIR)
message(FATAL_ERROR "WTL include dir not found")
endif()
diff --git a/processing/crashrptprobe/CrashRptProbe.rc b/processing/crashrptprobe/CrashRptProbe.rc
index e12b8e9..a08f63e 100644
--- a/processing/crashrptprobe/CrashRptProbe.rc
+++ b/processing/crashrptprobe/CrashRptProbe.rc
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "wtl/atlres.h"
+#include "atlres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -32,7 +32,7 @@ END
2 TEXTINCLUDE
BEGIN
- "#include ""wtl/atlres.h""\r\n"
+ "#include ""atlres.h""\r\n"
"\0"
END
diff --git a/processing/crashrptprobe/stdafx.h b/processing/crashrptprobe/stdafx.h
index 0b60659..2b027b2 100644
--- a/processing/crashrptprobe/stdafx.h
+++ b/processing/crashrptprobe/stdafx.h
@@ -70,13 +70,13 @@ namespace ATL
};
#endif // _WTL_SUPPORT_SDK_ATL3
-#include <wtl/atlapp.h>
+#include <atlapp.h>
extern CAppModule _Module;
#include <atlwin.h>
// CString-related includes
#define _WTL_USE_CSTRING
-#include <wtl/atlmisc.h>
+#include <atlmisc.h>
#if _MSC_VER<1400
#define WCSNCPY_S(strDest, sizeInBytes, strSource, count) wcsncpy(strDest, strSource, count)
diff --git a/reporting/crashrpt/CrashRpt.rc b/reporting/crashrpt/CrashRpt.rc
index a8c821b..95e7502 100644
--- a/reporting/crashrpt/CrashRpt.rc
+++ b/reporting/crashrpt/CrashRpt.rc
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "wtl/atlres.h"
+#include "atlres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -32,7 +32,7 @@ END
2 TEXTINCLUDE
BEGIN
- "#include ""wtl/atlres.h""\r\n"
+ "#include ""atlres.h""\r\n"
"\0"
END
diff --git a/reporting/crashrpt/StdAfx.h b/reporting/crashrpt/StdAfx.h
index 13bbe50..3ed0a55 100644
--- a/reporting/crashrpt/StdAfx.h
+++ b/reporting/crashrpt/StdAfx.h
@@ -54,12 +54,12 @@ namespace ATL
};
#endif // _WTL_SUPPORT_SDK_ATL3
-#include <wtl/atlapp.h>
+#include <atlapp.h>
extern CAppModule _Module;
#include <atlwin.h>
// CString-related includes
#define _WTL_USE_CSTRING
-#include <wtl/atlmisc.h>
+#include <atlmisc.h>
#include <new.h>
#include <map>
#include <set>
diff --git a/reporting/crashsender/CrashSender.rc b/reporting/crashsender/CrashSender.rc
index e10e269..0502962 100644
--- a/reporting/crashsender/CrashSender.rc
+++ b/reporting/crashsender/CrashSender.rc
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "wtl/atlres.h"
+#include "atlres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -243,7 +243,7 @@ END
2 TEXTINCLUDE
BEGIN
- "#include ""wtl/atlres.h""\r\n"
+ "#include ""atlres.h""\r\n"
"\0"
END
diff --git a/reporting/crashsender/stdafx.h b/reporting/crashsender/stdafx.h
index 4494d3a..9bbbe3a 100644
--- a/reporting/crashsender/stdafx.h
+++ b/reporting/crashsender/stdafx.h
@@ -61,19 +61,19 @@ namespace ATL
};
#endif // _WTL_SUPPORT_SDK_ATL3
-#include <wtl/atlapp.h>
+#include <atlapp.h>
extern CAppModule _Module;
#include <atlwin.h>
-#include <wtl/atlframe.h>
-#include <wtl/atlctrls.h>
-#include <wtl/atldlgs.h>
-#include <wtl/atlctrlx.h>
+#include <atlframe.h>
+#include <atlctrls.h>
+#include <atldlgs.h>
+#include <atlctrlx.h>
#define _WTL_USE_CSTRING
-#include <wtl/atlmisc.h>
+#include <atlmisc.h>
#include <string>
#include <vector>