Added version info resource to DLL build.

diff --git a/MUtilities.rc b/MUtilities.rc
new file mode 100644 (file)
index 0000000..6cc936c
--- /dev/null
+++ b/MUtilities.rc
@@ -0,0 +1,115 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define MUTILS_INC_CONFIG
+#include "src/Config.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "WinResrc.h" //"afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION VER_MUTILS_MAJOR,VER_MUTILS_MINOR_HI,VER_MUTILS_MINOR_LO,VER_MUTILS_PATCH
+ PRODUCTVERSION VER_MUTILS_MAJOR,VER_MUTILS_MINOR_HI,VER_MUTILS_MINOR_LO,VER_MUTILS_PATCH
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x3L
+#else
+ FILEFLAGS 0x2L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "Comments", "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY"
+            VALUE "CompanyName", "Free Software Foundation"
+            VALUE "FileDescription", "MuldeR's Utilities for Qt"
+            VALUE "FileVersion", VER_MUTILS_STR
+            VALUE "InternalName", "MUtilities"
+            VALUE "LegalCopyright", "Copyright (C) 2004-2019 LoRd_MuldeR <MuldeR2@GMX.de>"
+            VALUE "LegalTrademarks", "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License <http://www.gnu.org/>"
+            VALUE "OriginalFilename", "MUtils32-1.dll"
+            VALUE "ProductName", "MuldeR's Utilities for Qt"
+            VALUE "ProductVersion", VER_MUTILS_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
+#endif    // Neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// German (Germany) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
+#ifdef _WIN32
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "src\\Resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // German (Germany) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED

diff --git a/MUtilities_VS2013.vcxproj b/MUtilities_VS2013.vcxproj
index c648004..6fb81f8 100644 (file)
--- a/MUtilities_VS2013.vcxproj
+++ b/MUtilities_VS2013.vcxproj
@@ -95,6 +95,11 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="MUtilities.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">true</ExcludedFromBuild>
+    </ResourceCompile>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{55405FE1-149F-434C-9D72-4B64348D2A08}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>

diff --git a/MUtilities_VS2013.vcxproj.filters b/MUtilities_VS2013.vcxproj.filters
index f710dc2..6651de9 100644 (file)
--- a/MUtilities_VS2013.vcxproj.filters
+++ b/MUtilities_VS2013.vcxproj.filters
@@ -194,4 +194,9 @@
       <Filter>Resource Files</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="MUtilities.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/MUtilities_VS2015.vcxproj b/MUtilities_VS2015.vcxproj
index 945bbe2..d3c2cc0 100644 (file)
--- a/MUtilities_VS2015.vcxproj
+++ b/MUtilities_VS2015.vcxproj
@@ -95,6 +95,11 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="MUtilities.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">true</ExcludedFromBuild>
+    </ResourceCompile>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{55405FE1-149F-434C-9D72-4B64348D2A08}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>

diff --git a/MUtilities_VS2015.vcxproj.filters b/MUtilities_VS2015.vcxproj.filters
index f710dc2..6651de9 100644 (file)
--- a/MUtilities_VS2015.vcxproj.filters
+++ b/MUtilities_VS2015.vcxproj.filters
@@ -194,4 +194,9 @@
       <Filter>Resource Files</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="MUtilities.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/MUtilities_VS2017.vcxproj b/MUtilities_VS2017.vcxproj
index b8f9fd7..06827ac 100644 (file)
--- a/MUtilities_VS2017.vcxproj
+++ b/MUtilities_VS2017.vcxproj
@@ -95,6 +95,11 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="MUtilities.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">true</ExcludedFromBuild>
+    </ResourceCompile>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{55405FE1-149F-434C-9D72-4B64348D2A08}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>

diff --git a/MUtilities_VS2017.vcxproj.filters b/MUtilities_VS2017.vcxproj.filters
index f710dc2..6651de9 100644 (file)
--- a/MUtilities_VS2017.vcxproj.filters
+++ b/MUtilities_VS2017.vcxproj.filters
@@ -194,4 +194,9 @@
       <Filter>Resource Files</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="MUtilities.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/MUtilities_VS2019.vcxproj b/MUtilities_VS2019.vcxproj
index a58fa30..c28e76c 100644 (file)
--- a/MUtilities_VS2019.vcxproj
+++ b/MUtilities_VS2019.vcxproj
@@ -95,6 +95,11 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="MUtilities.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">true</ExcludedFromBuild>
+    </ResourceCompile>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{55405FE1-149F-434C-9D72-4B64348D2A08}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>

diff --git a/MUtilities_VS2019.vcxproj.filters b/MUtilities_VS2019.vcxproj.filters
index f710dc2..6651de9 100644 (file)
--- a/MUtilities_VS2019.vcxproj.filters
+++ b/MUtilities_VS2019.vcxproj.filters
@@ -194,4 +194,9 @@
       <Filter>Resource Files</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="MUtilities.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/src/Config.h b/src/Config.h
index 029113a..f0bb564 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -32,3 +32,13 @@
 #define VER_MUTILS_MAJOR                                       1
 #define VER_MUTILS_MINOR_HI                                    1
 #define VER_MUTILS_MINOR_LO                                    2
+#define VER_MUTILS_PATCH                                       0
+
+///////////////////////////////////////////////////////////////////////////////
+// Helper macros (aka: having fun with the C pre-processor)
+///////////////////////////////////////////////////////////////////////////////
+
+#define VER_MUTILS_STR_HLP1(X)                 #X
+#define VER_MUTILS_STR_HLP2(W,X,Y,Z)   VER_MUTILS_STR_HLP1(v##W.X##Y-Z)
+#define VER_MUTILS_STR_HLP3(W,X,Y,Z)   VER_MUTILS_STR_HLP2(W,X,Y,Z)
+#define VER_MUTILS_STR                                 VER_MUTILS_STR_HLP3(VER_MUTILS_MAJOR,VER_MUTILS_MINOR_HI,VER_MUTILS_MINOR_LO,VER_MUTILS_PATCH)