From 72fd5f234785d8849db66c86949107d25d04affd Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Tue, 30 Oct 2018 19:18:06 -0700 Subject: Merge .rc --- Source/Source.rc | 78 ------------------------------------------- Source/Source.vcxproj | 3 +- Source/Source.vcxproj.filters | 5 ++- Source/Version.rc | 62 ++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 80 deletions(-) delete mode 100644 Source/Source.rc 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 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#ifndef APSTUDIO_INVOKED -#include -#endif -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#ifndef APSTUDIO_INVOKED\r\n" - "#include ""targetver.h""\r\n" - "#endif\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -STRINGTABLE -BEGIN - IDS_APP_TITLE "Witness Randomizer" - IDC_SOURCE "SOURCE" -END - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - 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 @@ + @@ -182,7 +183,7 @@ - + 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 @@ Header Files + + Header Files + @@ -52,7 +55,7 @@ - + Resource Files 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 @@ #include "version.h" +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#ifndef APSTUDIO_INVOKED +#include +#endif +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#ifndef APSTUDIO_INVOKED\r\n" + "#include ""targetver.h""\r\n" + "#endif\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Witness Randomizer" + IDC_SOURCE "SOURCE" +END + +#endif // English (United States) resources VS_VERSION_INFO VERSIONINFO FILEVERSION VERSION -- cgit 1.4.1