fixed rc on windows (executable version)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5867 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 72 insertions, 94 deletions

diff --git a/data/resources_win32/kvirc.rc b/data/resources_win32/kvirc.rc
index 3075213cc..efb2d8611 100644
--- a/data/resources_win32/kvirc.rc
+++ b/data/resources_win32/kvirc.rc
@@ -22,64 +22,36 @@
 //

 //=============================================================================

 

-#include "resource.h"

+#include <windows.h>

+#include "version.h"

 

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_ICON1               ICON    DISCARDABLE     "icon1.ico"

+IDI_ICON1               ICON    DISCARDABLE "icon1.ico"

 IDD_ICON2               ICON    DISCARDABLE     "kvs.ico"

 IDD_ICON3               ICON    DISCARDABLE     "kvc.ico"

 IDD_ICON4               ICON    DISCARDABLE     "kvt.ico"

 IDD_ICON5               ICON    DISCARDABLE     "kva.ico"

 

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE DISCARDABLE

-BEGIN

-    "resource.h\0"

-END

-

-2 TEXTINCLUDE DISCARDABLE

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 4,0,0,0

- PRODUCTVERSION 4,0,0,0

- FILEFLAGSMASK 0x17L

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x4L

- FILETYPE 0x1L

- FILESUBTYPE 0x0L

+FILEVERSION     VER_FILEVERSION

+PRODUCTVERSION  VER_PRODUCTVERSION

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

-        BLOCK "000004b0"

+        BLOCK "040904E4"

         BEGIN

-            VALUE "CompanyName", "KVIrc Development Team"

-            VALUE "FileDescription", "KVIrc"

-            VALUE "FileVersion", "4, 0, 0, 0"

-            VALUE "InternalName", "KVIrc"

-            VALUE "LegalCopyright", "Copyright (C) 2009"

-            VALUE "OriginalFilename", "kvirc.exe"

-            VALUE "ProductName", "K Visual IRC Client"

-            VALUE "ProductVersion", "4, 0, 0, 0"

+            VALUE "CompanyName",        VER_COMPANYNAME_STR

+            VALUE "FileDescription",    VER_FILEDESCRIPTION_STR

+            VALUE "FileVersion",        VER_FILEVERSION_STR

+            VALUE "InternalName",       VER_INTERNALNAME_STR

+            VALUE "LegalCopyright",     VER_LEGALCOPYRIGHT_STR

+            VALUE "OriginalFilename",   VER_ORIGINALFILENAME_STR

+            VALUE "ProductName",        VER_PRODUCTNAME_STR

+            VALUE "ProductVersion",     VER_PRODUCTVERSION_STR

         END

     END

+

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

 END

diff --git a/data/resources_win32/resource.h b/data/resources_win32/version.h
index 52cd67bd5..e42a65cb6 100644
--- a/data/resources_win32/resource.h
+++ b/data/resources_win32/version.h
@@ -1,42 +1,48 @@
-//{{NO_DEPENDENCIES}}
-//=============================================================================
-//
-//   File : resource.h
-//   Creation date : Unknown by Szymon Stefanek
-//
-//   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2009 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-//=============================================================================
-
-//
-#define IDD_ICON1                       100
-#define IDD_ICON2                       101
-#define IDD_ICON3                       102
-#define IDD_ICON4                       103
-#define IDD_ICON5                       104
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
+//=============================================================================

+//

+//   File : version.h

+//   Creation date : Unknown by Szymon Stefanek

+//

+//   This toolbar is part of the KVirc irc client distribution

+//   Copyright (C) 2009 Szymon Stefanek (pragma at kvirc dot net)

+//

+//   This program is FREE software. You can redistribute it and/or

+//   modify it under the terms of the GNU General Public License

+//   as published by the Free Software Foundation; either version 2

+//   of the License, or (at your opinion) any later version.

+//

+//   This program is distributed in the HOPE that it will be USEFUL,

+//   but WITHOUT ANY WARRANTY; without even the implied warranty of

+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+//   See the GNU General Public License for more details.

+//

+//   You should have received a copy of the GNU General Public License

+//   along with this program. If not, write to the Free Software Foundation,

+//   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

+//

+//=============================================================================

+

+#ifndef VERSION_H

+#define VERSION_H

+

+#define IDD_ICON2                       101

+#define IDD_ICON3                       102

+#define IDD_ICON4                       103

+#define IDD_ICON5                       104

+

+#define VER_FILEVERSION             4,1,1,0

+#define VER_FILEVERSION_STR         "4.1.1.0\0"

+

+#define VER_PRODUCTVERSION          4,1,1,0

+#define VER_PRODUCTVERSION_STR      "4.1\0"

+

+#define VER_COMPANYNAME_STR         "KVIrc Development Team"

+#define VER_FILEDESCRIPTION_STR     "KVIrc"

+#define VER_INTERNALNAME_STR        "KVIrc"

+#define VER_LEGALCOPYRIGHT_STR      "Copyright © 2011"

+#define VER_ORIGINALFILENAME_STR    "kvirc.exe"

+#define VER_PRODUCTNAME_STR         "K Visual IRC Client"

+

+#define VER_COMPANYDOMAIN_STR       "kvirc.net"

+

+#endif // VERSION_H

diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index 5c03d0ac4..7ca08f264 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -333,11 +333,11 @@ QT4_WRAP_CPP(kvirc_MOC_SRCS ${kvirc_MOC_HDRS})
 
 IF(MINGW)
 	# resource compilation for mingw
-	ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/win32_resource.o
-		COMMAND windres.exe -I${CMAKE_SOURCE_DIR}/data/resources_win32/ -i${CMAKE_SOURCE_DIR}/data/resources_win32/kvirc.rc -o${CMAKE_CURRENT_BINARY_DIR}/win32_resource.o
-		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data/resources_win32
-	)
-	LIST(APPEND kvirc_SRCS ${CMAKE_CURRENT_BINARY_DIR}/win32_resource.o)
+	set(CMAKE_RC_COMPILER_INIT windres)
+	ENABLE_LANGUAGE(RC)
+	SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+
+	LIST(APPEND kvirc_SRCS ${CMAKE_SOURCE_DIR}/data/resources_win32/kvirc.rc)
 ENDIF()
 
 IF(MSVC)