revert inadvertent changes

launcher/src/resource.rc

@@ -1,6 +1,15 @@
-// Microsoft Visual C++ generated resource script.
+/*                  _
-//
+  ___ _ __ ___   __| | ___ _ __
+ / __| '_ ` _ \ / _` |/ _ \ '__|
+| (__| | | | | | (_| |  __/ |
+ \___|_| |_| |_|\__,_|\___|_|
+=============================================================================
+ The Cmder Console Emulator Project
+*/
+
 #include "resource.h"
+#include "version.rc2"
+#include "strings.rc2"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +26,6 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -27,24 +35,23 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 TEXTINCLUDE
 BEGIN
-    "resource.h\0"
+"resource.h\0"
 END
 
 2 TEXTINCLUDE
 BEGIN
-    "#include ""winres.h""\r\n"
+"#include ""winres.h""\r\n"
-    "\0"
+"\0"
 END
 
 3 TEXTINCLUDE
 BEGIN
-    "\r\n"
+"\r\n"
-    "\0"
+"\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -53,7 +60,8 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_CMDER               ICON                    "..\\..\\icons\\cmder.ico"
-
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -61,30 +69,26 @@ IDI_CMDER               ICON                    "..\\..\\icons\\cmder.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,6,1
+ FILEVERSION CMDER_MAJOR_VERSION,CMDER_MINOR_VERSION,CMDER_REVISION_VERSION,CMDER_BUILD_VERSION
- PRODUCTVERSION 1,3,6,1
+ PRODUCTVERSION CMDER_MAJOR_VERSION,CMDER_MINOR_VERSION,CMDER_REVISION_VERSION,CMDER_BUILD_VERSION
- FILEFLAGSMASK 0x3fL
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
+ FILEFLAGS (CMDER_DEBUGFLAG | CMDER_BUILDFLAGS)
- FILEFLAGS 0x1L
+ FILEOS VOS_NT_WINDOWS32
-#else
+ FILETYPE VFT_APP
- FILEFLAGS 0x0L
+ FILESUBTYPE VFT2_UNKNOWN
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "100904b0"
         BEGIN
-            VALUE "CompanyName", "Samuel Vasko"
+            VALUE "CompanyName", CMDER_COMPANY_NAME_STR "\0"
-            VALUE "FileDescription", "Cmder: Lovely Console Emulator."
+            VALUE "FileDescription", CMDER_FILE_DESCRIPTION_STR "\0"
-            VALUE "FileVersion", "1.3.6-pre1"
+            VALUE "FileVersion", CMDER_VERSION_STR "\0"
-            VALUE "InternalName", "Cmder"
+            VALUE "InternalName", CMDER_INTERNAL_NAME_STR "\0"
-            VALUE "LegalCopyright", "Copyright (C) 2016 Samuel Vasko"
+            VALUE "LegalCopyright", "Copyright (C) " CMDER_COPYRIGHT_YEAR_STR " " CMDER_COMPANY_NAME_STR "\0"
-            VALUE "OriginalFilename", "Cmder.exe"
+            VALUE "OriginalFilename", CMDER_ORIGINAL_FILENAME_STR "\0"
-            VALUE "ProductName", "Cmder"
+            VALUE "ProductName", CMDER_PRODUCT_NAME_STR "\0"
-            VALUE "ProductVersion", "1.3.6-pre1"
+            VALUE "ProductVersion", CMDER_VERSION_STR "\0"
         END
     END
     BLOCK "VarFileInfo"
@@ -93,26 +97,7 @@ BEGIN
     END
 END
 
-
 /////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE
-BEGIN
-    IDS_TITLE               "Cmder Launcher"
-END
-
-STRINGTABLE
-BEGIN
-    IDS_SWITCHES            "Valid options:\n\n    /c [CMDER User Root Path]\n    /task [Windows Terminal Profile/ConEmu Task Name]\n    /icon [CMDER Icon Path] - ConEmu ONLY!\n    [/start [Start in Path] | [Start in Path]]\n    /single - ConEmu ONLY!\n    /m\n    -- [ConEmu/Windows Terminal extra arguments]\n\nNote: '-- [...]' must be the last argument!\n\nor, either:\n    /register [USER | ALL]\n    /unregister [USER | ALL]"
-END
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
 
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -120,7 +105,5 @@ END
 // Generated from the TEXTINCLUDE 3 resource.
 //
 
-
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
-

launcher/src/strings.rc2

@@ -6,7 +6,7 @@ STRINGTABLE
 {
 	IDS_TITLE             "Cmder Launcher"
 
-	IDS_SWITCHES          L"Valid options:\n\n    /a Admin - Native Terminals ONLY!\n    /c [CMDER User Root Path]\n    /task [Windows Terminal Profile/ConEmu Task Name]\n    /icon [CMDER Icon Path] - ConEmu ONLY!\n    [/start [Start in Path] | [Start in Path]]\n    /single - ConEmu ONLY!\n    /m\n    -- [ConEmu/Windows Terminal extra arguments]\n\nNote: '-- [...]' must be the last argument!\n\nor, either:\n    /register [USER | ALL]\n    /unregister [USER | ALL]"
+	IDS_SWITCHES          L"Valid options:\n\n    /c [CMDER User Root Path]\n    /task [Windows Terminal Profile/ConEmu Task Name]\n    /icon [CMDER Icon Path] - ConEmu ONLY!\n    [/start [Start in Path] | [Start in Path]]\n    /single - ConEmu ONLY!\n    /m\n    -- [ConEmu/Windows Terminal extra arguments]\n\nNote: '-- [...]' must be the last argument!\n\nor, either:\n    /register [USER | ALL]\n    /unregister [USER | ALL]"
 }
 
 /////////////////////////////////////////////////////////////////////////////