diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-06 15:06:28 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-06 15:06:28 -0800 |
| commit | 7347305e8459fcc78553a9f88196e0d93eb0a8fe (patch) | |
| tree | ac9eee9ff267c6a71a83249bed7a94f02b00d9a5 /ports/devil/0002_fix-missing-mfc-includes.patch | |
| parent | ed9357a5aafea7192932b5874264bd103fc61255 (diff) | |
| parent | 63c1b2628e958f8e02356411f032941c0c2f3bbb (diff) | |
| download | vcpkg-7347305e8459fcc78553a9f88196e0d93eb0a8fe.tar.gz vcpkg-7347305e8459fcc78553a9f88196e0d93eb0a8fe.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425
Diffstat (limited to 'ports/devil/0002_fix-missing-mfc-includes.patch')
| -rw-r--r-- | ports/devil/0002_fix-missing-mfc-includes.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/ports/devil/0002_fix-missing-mfc-includes.patch b/ports/devil/0002_fix-missing-mfc-includes.patch index 755d0d867..3b18981ce 100644 --- a/ports/devil/0002_fix-missing-mfc-includes.patch +++ b/ports/devil/0002_fix-missing-mfc-includes.patch @@ -1,7 +1,7 @@ -diff --git a/src-IL/msvc/IL Unicode.rc b/src-IL/msvc/IL Unicode.rc +diff --git a/DevIL/src-IL/msvc/IL Unicode.rc b/DevIL/src-IL/msvc/IL Unicode.rc index 346758f..298a207 100644 ---- a/src-IL/msvc/IL Unicode.rc -+++ b/src-IL/msvc/IL Unicode.rc +--- a/DevIL/src-IL/msvc/IL Unicode.rc ++++ b/DevIL/src-IL/msvc/IL Unicode.rc @@ -7,7 +7,11 @@ // // Generated from the TEXTINCLUDE 2 resource. @@ -15,10 +15,10 @@ index 346758f..298a207 100644 ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS -diff --git a/src-IL/msvc/IL.rc b/src-IL/msvc/IL.rc +diff --git a/DevIL/src-IL/msvc/IL.rc b/DevIL/src-IL/msvc/IL.rc index 8bfadf9..0b8289f 100644 ---- a/src-IL/msvc/IL.rc -+++ b/src-IL/msvc/IL.rc +--- a/DevIL/src-IL/msvc/IL.rc ++++ b/DevIL/src-IL/msvc/IL.rc @@ -7,10 +7,13 @@ // // Generated from the TEXTINCLUDE 2 resource. @@ -35,10 +35,10 @@ index 8bfadf9..0b8289f 100644 ///////////////////////////////////////////////////////////////////////////// // English (United States) resources -diff --git a/src-IL/msvc8/IL Unicode.rc b/src-IL/msvc8/IL Unicode.rc +diff --git a/DevIL/src-IL/msvc8/IL Unicode.rc b/DevIL/src-IL/msvc8/IL Unicode.rc index 026ee49..66ca4bf 100644 ---- a/src-IL/msvc8/IL Unicode.rc -+++ b/src-IL/msvc8/IL Unicode.rc +--- a/DevIL/src-IL/msvc8/IL Unicode.rc ++++ b/DevIL/src-IL/msvc8/IL Unicode.rc @@ -7,7 +7,10 @@ // // Generated from the TEXTINCLUDE 2 resource. @@ -51,10 +51,10 @@ index 026ee49..66ca4bf 100644 ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS -diff --git a/src-IL/msvc8/IL.rc b/src-IL/msvc8/IL.rc +diff --git a/DevIL/src-IL/msvc8/IL.rc b/DevIL/src-IL/msvc8/IL.rc index 9301d41..3ad52c0 100644 ---- a/src-IL/msvc8/IL.rc -+++ b/src-IL/msvc8/IL.rc +--- a/DevIL/src-IL/msvc8/IL.rc ++++ b/DevIL/src-IL/msvc8/IL.rc @@ -7,7 +7,10 @@ // // Generated from the TEXTINCLUDE 2 resource. @@ -67,10 +67,10 @@ index 9301d41..3ad52c0 100644 ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS -diff --git a/src-IL/msvc9/IL Unicode.rc b/src-IL/msvc9/IL Unicode.rc +diff --git a/DevIL/src-IL/msvc9/IL Unicode.rc b/DevIL/src-IL/msvc9/IL Unicode.rc index d0dff4f..c9cf51f 100644 ---- a/src-IL/msvc9/IL Unicode.rc -+++ b/src-IL/msvc9/IL Unicode.rc +--- a/DevIL/src-IL/msvc9/IL Unicode.rc ++++ b/DevIL/src-IL/msvc9/IL Unicode.rc @@ -7,7 +7,10 @@ // // Generated from the TEXTINCLUDE 2 resource. @@ -83,10 +83,10 @@ index d0dff4f..c9cf51f 100644 ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS -diff --git a/src-IL/msvc9/IL.rc b/src-IL/msvc9/IL.rc +diff --git a/DevIL/src-IL/msvc9/IL.rc b/DevIL/src-IL/msvc9/IL.rc index 9f5c795..6b8c891 100644 ---- a/src-IL/msvc9/IL.rc -+++ b/src-IL/msvc9/IL.rc +--- a/DevIL/src-IL/msvc9/IL.rc ++++ b/DevIL/src-IL/msvc9/IL.rc @@ -7,7 +7,10 @@ // // Generated from the TEXTINCLUDE 2 resource. |