diff options
| author | jbzdarkid <jbzdarkid@gmail.com> | 2018-10-30 19:18:06 -0700 |
|---|---|---|
| committer | jbzdarkid <jbzdarkid@gmail.com> | 2018-10-30 19:18:06 -0700 |
| commit | 72fd5f234785d8849db66c86949107d25d04affd (patch) | |
| tree | 0b975368785965e592dc42b265b9b8d4f48e1eaf | |
| parent | 80c90a97d23eb73f287fc6302ab500c568c5a9a0 (diff) | |
| download | witness-tutorializer-72fd5f234785d8849db66c86949107d25d04affd.tar.gz witness-tutorializer-72fd5f234785d8849db66c86949107d25d04affd.tar.bz2 witness-tutorializer-72fd5f234785d8849db66c86949107d25d04affd.zip | |
Merge .rc
| -rw-r--r-- | Source/Source.rc | 78 | ||||
| -rw-r--r-- | Source/Source.vcxproj | 3 | ||||
| -rw-r--r-- | Source/Source.vcxproj.filters | 5 | ||||
| -rw-r--r-- | Source/Version.rc | 62 |
4 files changed, 68 insertions, 80 deletions
| diff --git a/Source/Source.rc b/Source/Source.rc deleted file mode 100644 index b981a72..0000000 --- a/Source/Source.rc +++ /dev/null | |||
| @@ -1,78 +0,0 @@ | |||
| 1 | // Microsoft Visual C++ generated resource script. | ||
| 2 | // | ||
| 3 | #include "resource.h" | ||
| 4 | |||
| 5 | #define APSTUDIO_READONLY_SYMBOLS | ||
| 6 | ///////////////////////////////////////////////////////////////////////////// | ||
| 7 | // | ||
| 8 | // Generated from the TEXTINCLUDE 2 resource. | ||
| 9 | // | ||
| 10 | #ifndef APSTUDIO_INVOKED | ||
| 11 | #include <SDKDDKVer.h> | ||
| 12 | #endif | ||
| 13 | #define APSTUDIO_HIDDEN_SYMBOLS | ||
| 14 | #include "windows.h" | ||
| 15 | #undef APSTUDIO_HIDDEN_SYMBOLS | ||
| 16 | |||
| 17 | ///////////////////////////////////////////////////////////////////////////// | ||
| 18 | #undef APSTUDIO_READONLY_SYMBOLS | ||
| 19 | |||
| 20 | ///////////////////////////////////////////////////////////////////////////// | ||
| 21 | // English (United States) resources | ||
| 22 | |||
| 23 | #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) | ||
| 24 | LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US | ||
| 25 | #pragma code_page(1252) | ||
| 26 | |||
| 27 | |||
| 28 | #ifdef APSTUDIO_INVOKED | ||
| 29 | ///////////////////////////////////////////////////////////////////////////// | ||
| 30 | // | ||
| 31 | // TEXTINCLUDE | ||
| 32 | // | ||
| 33 | |||
| 34 | 1 TEXTINCLUDE | ||
| 35 | BEGIN | ||
| 36 | "resource.h\0" | ||
| 37 | END | ||
| 38 | |||
| 39 | 2 TEXTINCLUDE | ||
| 40 | BEGIN | ||
| 41 | "#ifndef APSTUDIO_INVOKED\r\n" | ||
| 42 | "#include ""targetver.h""\r\n" | ||
| 43 | "#endif\r\n" | ||
| 44 | "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" | ||
| 45 | "#include ""windows.h""\r\n" | ||
| 46 | "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" | ||
| 47 | "\0" | ||
| 48 | END | ||
| 49 | |||
| 50 | 3 TEXTINCLUDE | ||
| 51 | BEGIN | ||
| 52 | "\r\n" | ||
| 53 | "\0" | ||
| 54 | END | ||
| 55 | |||
| 56 | #endif // APSTUDIO_INVOKED | ||
| 57 | |||
| 58 | STRINGTABLE | ||
| 59 | BEGIN | ||
| 60 | IDS_APP_TITLE "Witness Randomizer" | ||
| 61 | IDC_SOURCE "SOURCE" | ||
| 62 | END | ||
| 63 | |||
| 64 | #endif // English (United States) resources | ||
| 65 | ///////////////////////////////////////////////////////////////////////////// | ||
| 66 | |||
| 67 | |||
| 68 | |||
| 69 | #ifndef APSTUDIO_INVOKED | ||
| 70 | ///////////////////////////////////////////////////////////////////////////// | ||
| 71 | // | ||
| 72 | // Generated from the TEXTINCLUDE 3 resource. | ||
| 73 | // | ||
| 74 | |||
| 75 | |||
| 76 | ///////////////////////////////////////////////////////////////////////////// | ||
| 77 | #endif // not APSTUDIO_INVOKED | ||
| 78 | |||
| diff --git a/Source/Source.vcxproj b/Source/Source.vcxproj index 65cf3e7..da9ac51 100644 --- a/Source/Source.vcxproj +++ b/Source/Source.vcxproj | |||
| @@ -168,6 +168,7 @@ | |||
| 168 | <ClInclude Include="RandomizerCore.h" /> | 168 | <ClInclude Include="RandomizerCore.h" /> |
| 169 | <ClInclude Include="Resource.h" /> | 169 | <ClInclude Include="Resource.h" /> |
| 170 | <ClInclude Include="stdafx.h" /> | 170 | <ClInclude Include="stdafx.h" /> |
| 171 | <ClInclude Include="Version.h" /> | ||
| 171 | </ItemGroup> | 172 | </ItemGroup> |
| 172 | <ItemGroup> | 173 | <ItemGroup> |
| 173 | <ClCompile Include="Main.cpp" /> | 174 | <ClCompile Include="Main.cpp" /> |
| @@ -182,7 +183,7 @@ | |||
| 182 | </ClCompile> | 183 | </ClCompile> |
| 183 | </ItemGroup> | 184 | </ItemGroup> |
| 184 | <ItemGroup> | 185 | <ItemGroup> |
| 185 | <ResourceCompile Include="Source.rc" /> | 186 | <ResourceCompile Include="Version.rc" /> |
| 186 | </ItemGroup> | 187 | </ItemGroup> |
| 187 | <ItemGroup> | 188 | <ItemGroup> |
| 188 | <Image Include="small.ico" /> | 189 | <Image Include="small.ico" /> |
| diff --git a/Source/Source.vcxproj.filters b/Source/Source.vcxproj.filters index c286fde..54e3f9a 100644 --- a/Source/Source.vcxproj.filters +++ b/Source/Source.vcxproj.filters | |||
| @@ -33,6 +33,9 @@ | |||
| 33 | <ClInclude Include="RandomizerCore.h"> | 33 | <ClInclude Include="RandomizerCore.h"> |
| 34 | <Filter>Header Files</Filter> | 34 | <Filter>Header Files</Filter> |
| 35 | </ClInclude> | 35 | </ClInclude> |
| 36 | <ClInclude Include="Version.h"> | ||
| 37 | <Filter>Header Files</Filter> | ||
| 38 | </ClInclude> | ||
| 36 | </ItemGroup> | 39 | </ItemGroup> |
| 37 | <ItemGroup> | 40 | <ItemGroup> |
| 38 | <ClCompile Include="stdafx.cpp"> | 41 | <ClCompile Include="stdafx.cpp"> |
| @@ -52,7 +55,7 @@ | |||
| 52 | </ClCompile> | 55 | </ClCompile> |
| 53 | </ItemGroup> | 56 | </ItemGroup> |
| 54 | <ItemGroup> | 57 | <ItemGroup> |
| 55 | <ResourceCompile Include="Source.rc"> | 58 | <ResourceCompile Include="Version.rc"> |
| 56 | <Filter>Resource Files</Filter> | 59 | <Filter>Resource Files</Filter> |
| 57 | </ResourceCompile> | 60 | </ResourceCompile> |
| 58 | </ItemGroup> | 61 | </ItemGroup> |
| diff --git a/Source/Version.rc b/Source/Version.rc index 02b2b98..c570b80 100644 --- a/Source/Version.rc +++ b/Source/Version.rc | |||
| @@ -1,4 +1,66 @@ | |||
| 1 | #include "version.h" | 1 | #include "version.h" |
| 2 | #include "resource.h" | ||
| 3 | |||
| 4 | #define APSTUDIO_READONLY_SYMBOLS | ||
| 5 | ///////////////////////////////////////////////////////////////////////////// | ||
| 6 | // | ||
| 7 | // Generated from the TEXTINCLUDE 2 resource. | ||
| 8 | // | ||
| 9 | #ifndef APSTUDIO_INVOKED | ||
| 10 | #include <SDKDDKVer.h> | ||
| 11 | #endif | ||
| 12 | #define APSTUDIO_HIDDEN_SYMBOLS | ||
| 13 | #include "windows.h" | ||
| 14 | #undef APSTUDIO_HIDDEN_SYMBOLS | ||
| 15 | |||
| 16 | ///////////////////////////////////////////////////////////////////////////// | ||
| 17 | #undef APSTUDIO_READONLY_SYMBOLS | ||
| 18 | |||
| 19 | ///////////////////////////////////////////////////////////////////////////// | ||
| 20 | // English (United States) resources | ||
| 21 | |||
| 22 | #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) | ||
| 23 | LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US | ||
| 24 | #pragma code_page(1252) | ||
| 25 | |||
| 26 | |||
| 27 | #ifdef APSTUDIO_INVOKED | ||
| 28 | ///////////////////////////////////////////////////////////////////////////// | ||
| 29 | // | ||
| 30 | // TEXTINCLUDE | ||
| 31 | // | ||
| 32 | |||
| 33 | 1 TEXTINCLUDE | ||
| 34 | BEGIN | ||
| 35 | "resource.h\0" | ||
| 36 | END | ||
| 37 | |||
| 38 | 2 TEXTINCLUDE | ||
| 39 | BEGIN | ||
| 40 | "#ifndef APSTUDIO_INVOKED\r\n" | ||
| 41 | "#include ""targetver.h""\r\n" | ||
| 42 | "#endif\r\n" | ||
| 43 | "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" | ||
| 44 | "#include ""windows.h""\r\n" | ||
| 45 | "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" | ||
| 46 | "\0" | ||
| 47 | END | ||
| 48 | |||
| 49 | 3 TEXTINCLUDE | ||
| 50 | BEGIN | ||
| 51 | "\r\n" | ||
| 52 | "\0" | ||
| 53 | END | ||
| 54 | |||
| 55 | #endif // APSTUDIO_INVOKED | ||
| 56 | |||
| 57 | STRINGTABLE | ||
| 58 | BEGIN | ||
| 59 | IDS_APP_TITLE "Witness Randomizer" | ||
| 60 | IDC_SOURCE "SOURCE" | ||
| 61 | END | ||
| 62 | |||
| 63 | #endif // English (United States) resources | ||
| 2 | 64 | ||
| 3 | VS_VERSION_INFO VERSIONINFO | 65 | VS_VERSION_INFO VERSIONINFO |
| 4 | FILEVERSION VERSION | 66 | FILEVERSION VERSION |
