Fix version info in tools

code/nel/tools/3d/tile_edit/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 FILE(GLOB SRC2 cpu.cpp DllEntry.cpp Popup.* thread_win32.* TileCtrl.* TileList.* TileView.*)
 LIST(REMOVE_ITEM SRC ${SRC2})

code/nel/tools/3d/tile_edit/tile_edit_exe.rc

@@ -91,50 +91,13 @@ END
 
 3 TEXTINCLUDE 
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,6,0,0
- PRODUCTVERSION 0,6,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileVersion", "0.6.0.0"
-            VALUE "InternalName", "tile_edit_exe"
-            VALUE "OriginalFilename", "tile_edit.exe"
-            VALUE "ProductName", "NeL Tilebank Editor"
-            VALUE "ProductVersion", "0.6.0.0"
-			VALUE "Comments", "http://www.opennel.org/"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -409,7 +372,7 @@ IDB_BITMAP5             BITMAP                  "rot3.bmp"
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/3d/tile_edit/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Tilebank Editor"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "tile_edit" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/misc/branch_patcher/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
-ADD_EXECUTABLE(branch_patcher WIN32 ${SRC} branch_patcher.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(branch_patcher WIN32 ${SRC})
 
 #TARGET_LINK_LIBRARIES(branch_patcher ${PLATFORM_LINKFLAGS})
 NL_DEFAULT_PROPS(branch_patcher "NeL, Tools, Misc: branch_patcher")

code/nel/tools/misc/branch_patcher/branch_patcher.rc

@@ -53,52 +53,6 @@ BEGIN
 END
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Nevrax\0"
-            VALUE "FileDescription", "branch_patcher MFC Application\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "branch_patcher\0"
-            VALUE "LegalCopyright", "Copyright (C) 2003\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "branch_patcher.EXE\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Nevrax Branch Patcher\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -148,6 +102,8 @@ BEGIN
     "#include ""res\\branch_patcher.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\r\n"
+    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -186,6 +142,8 @@ LANGUAGE 9, 1
 #include "afxres.rc"         // Standard components
 #endif
 
+#include "version.rc2"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

code/nel/tools/misc/branch_patcher/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Branch Patcher"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "branch_patcher" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/misc/data_mirror/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
-ADD_EXECUTABLE(data_mirror WIN32 ${SRC} data_mirror.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(data_mirror WIN32 ${SRC})
 
 TARGET_LINK_LIBRARIES(data_mirror nelmisc)
 NL_DEFAULT_PROPS(data_mirror "NeL, Tools, Misc: data_mirror")

code/nel/tools/misc/data_mirror/data_mirror.rc

@@ -71,49 +71,6 @@ BEGIN
 END
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "data_mirror MFC Application\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "data_mirror\0"
-            VALUE "LegalCopyright", "Copyright (C) 2003\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "data_mirror.EXE\0"
-            VALUE "ProductName", "data_mirror Application\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -207,6 +164,8 @@ BEGIN
     "#include ""res\\data_mirror.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\r\n"
+    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -236,6 +195,8 @@ LANGUAGE 9, 1
 #include "afxres.rc"         // Standard components
 #endif
 
+#include "version.rc2"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

code/nel/tools/misc/data_mirror/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Data Mirror"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "data_mirror" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/misc/log_analyser/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
-ADD_EXECUTABLE(log_analyser WIN32 ${SRC} log_analyser.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(log_analyser WIN32 ${SRC})
 
 TARGET_LINK_LIBRARIES(log_analyser nelmisc)
 NL_DEFAULT_PROPS(log_analyser "NeL, Tools, Misc: log_analyser")

code/nel/tools/misc/log_analyser/log_analyser.rc

@@ -109,52 +109,6 @@ BEGIN
 END
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,0,1
- PRODUCTVERSION 1,5,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Nevrax\0"
-            VALUE "FileDescription", "NeL Log Analyser\0"
-            VALUE "FileVersion", "1, 5, 0, 1\0"
-            VALUE "InternalName", "log_analyser\0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2003 Nevrax\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "NeL Log Analyser\0"
-            VALUE "ProductVersion", "1, 5, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -238,6 +192,8 @@ BEGIN
     "#include ""res\\log_analyser.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\r\n"
+    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -276,6 +232,8 @@ LANGUAGE 9, 1
 #include "afxres.rc"         // Standard components
 #endif
 
+#include "version.rc2"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

code/nel/tools/misc/log_analyser/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Log Analyser"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "log_analyser" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/misc/multi_cd_setup_fix/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
-ADD_EXECUTABLE(multi_cd_setup_fix WIN32 ${SRC} multi_cd_setup_fix.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(multi_cd_setup_fix WIN32 ${SRC})
 
 #TARGET_LINK_LIBRARIES(multi_cd_setup_fix ${PLATFORM_LINKFLAGS})
 NL_DEFAULT_PROPS(multi_cd_setup_fix "NeL, Tools, Misc: multi_cd_setup_fix")

code/nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.rc

@@ -49,7 +49,7 @@ END
 
 3 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -99,7 +99,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/misc/multi_cd_setup_fix/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Multi CD Setup Fix"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "multi_cd_setup_fix" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/misc/words_dic/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(words_dic WIN32 ${SRC} words_dic.rc)
 

code/nel/tools/misc/words_dic/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Words Dictionary"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "words_dic" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/misc/words_dic/words_dic.rc

@@ -48,52 +48,6 @@ BEGIN
 END
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Nevrax\0"
-            VALUE "FileDescription", "\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "words_dic\0"
-            VALUE "LegalCopyright", "Copyright (C) 2003\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Nevrax Words Dictionary\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -142,6 +96,8 @@ BEGIN
     "#include ""res\\words_dic.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\r\n"
+    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -212,6 +168,8 @@ LANGUAGE 9, 1
 #include "afxres.rc"         // Standard components
 #endif
 
+#include "version.rc2"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

code/nel/tools/misc/words_dic_qt/CMakeLists.txt

@@ -1,14 +1,13 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
-FILE(GLOB WORDS_DIC_SRC *.cpp *.h)
+FILE(GLOB WORDS_DIC_SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${WORDS_DIC_SRC})
+
 SET(WORDS_DIC_HDR words_dicDlg.h)
 SET(WORDS_DIC_UIS words_dic_Qt.ui)
 SET(WORDS_DIC_RCS words_dic_Qt.qrc)
 
-IF(WIN32)
-  SET(WORDS_DIC_RC words_dic.rc)
-ENDIF()
-
 ADD_DEFINITIONS(-DNL_WORDS_DIC_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
 IF(WITH_QT)
@@ -29,7 +28,7 @@ ELSE()
   QT5_WRAP_CPP(WORDS_DIC_MOC_SRCS ${WORDS_DIC_HDR})
 ENDIF()
 
-ADD_EXECUTABLE(words_dic_qt WIN32 ${WORDS_DIC_SRC} ${WORDS_DIC_MOC_SRCS} ${WORDS_DIC_RC_SRCS} ${WORDS_DIC_UI_HDRS} ${WORDS_DIC_RC})
+ADD_EXECUTABLE(words_dic_qt WIN32 ${WORDS_DIC_SRC} ${WORDS_DIC_MOC_SRCS} ${WORDS_DIC_RC_SRCS} ${WORDS_DIC_UI_HDRS})
 
 TARGET_LINK_LIBRARIES(words_dic_qt ${QT_LIBRARIES} nelmisc)
 NL_DEFAULT_PROPS(words_dic_qt "NeL, Tools, Misc: Qt Words Dic")

code/nel/tools/misc/words_dic_qt/words_dic.rc

@@ -1,46 +1,48 @@
 #include "resource.h"
 
 #include <windows.h>
+#include "config.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
+ FILEVERSION NL_VERSION_RC
- PRODUCTVERSION 1,0,0,1
+ PRODUCTVERSION NL_VERSION_RC
- FILEFLAGSMASK 0x3fL
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
- FILEFLAGS 0x1L
+ FILEFLAGS VS_FF_DEBUG
 #else
  FILEFLAGS 0x0L
 #endif
- FILEOS 0x4L
+ FILEOS VOS_NT_WINDOWS32
- FILETYPE 0x1L
+ FILETYPE VFT_APP
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "Comments", "\0"
+            VALUE "CompanyName", AUTHOR
-            VALUE "CompanyName", "Nevrax\0"
+            VALUE "FileDescription", "NeL Words Dictionary"
-            VALUE "FileDescription", "\0"
+            VALUE "FileVersion", NL_VERSION
-            VALUE "FileVersion", "1, 0, 0, 1\0"
+            VALUE "LegalCopyright", COPYRIGHT
-            VALUE "InternalName", "words_dic\0"
+            VALUE "OriginalFilename", "words_dic_qt" NL_FILEEXT ".exe"
-            VALUE "LegalCopyright", "Copyright (C) 2003\0"
+            VALUE "ProductName", "NeL Tools"
-            VALUE "LegalTrademarks", "\0"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
-            VALUE "OriginalFilename", "\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Nevrax Words Dictionary\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1200
+        VALUE "Translation", 0x9, 1200
     END
 END
 

code/ryzom/tools/leveldesign/georges_dll/CMakeLists.txt

@@ -1,7 +1,9 @@
 
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
-ADD_LIBRARY(georges_dll SHARED ${SRC} georges_edit.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_LIBRARY(georges_dll SHARED ${SRC})
 
 INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

code/ryzom/tools/leveldesign/georges_dll/georges_edit.rc

@@ -52,6 +52,8 @@ BEGIN
     "#include ""res\\georges_edit.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\r\n"
+    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -452,18 +454,6 @@ END
 // Dialog
 //
 
-IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 235, 55
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "About Georges Edit"
-FONT 8, "MS Sans Serif"
-BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,11,17,20,20
-    LTEXT           "Georges Edit Version 1.24",IDC_STATIC,40,10,119,8,
-                    SS_NOPREFIX
-    LTEXT           "Nevrax Copyright (C) 2002",IDC_STATIC,40,25,119,8
-    DEFPUSHBUTTON   "OK",IDOK,178,7,50,14,WS_GROUP
-END
-
 IDR_MAINFRAME DIALOG DISCARDABLE  0, 0, 330, 16
 STYLE WS_CHILD
 FONT 8, "MS Sans Serif"
@@ -522,52 +512,6 @@ BEGIN
 END
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "Georges Edit MFC Application\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "Georges Edit\0"
-            VALUE "LegalCopyright", "Copyright (C) 2002\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "georges_edit.EXE\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Georges Edit Application\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -844,6 +788,8 @@ LANGUAGE 9, 1
 #include "afxres.rc"         // Standard components
 #endif
 
+#include "version.rc2"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

code/ryzom/tools/leveldesign/georges_dll/version.rc2

@@ -0,0 +1,62 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT "_r"
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "Ryzom Georges Edit dynamic library"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "georges" NL_FILEEXT ".dll"
+            VALUE "ProductName", "Ryzom Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 235, 55
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "About Georges Edit"
+FONT 8, "MS Sans Serif"
+BEGIN
+    ICON            IDR_MAINFRAME,IDC_STATIC,11,17,20,20
+    LTEXT           NL_VERSION,IDC_STATIC,40,10,119,8,SS_NOPREFIX
+    LTEXT           COPYRIGHT,IDC_STATIC,40,25,119,8
+    DEFPUSHBUTTON   "OK",IDOK,178,7,50,14,WS_GROUP
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/ryzom/tools/leveldesign/georges_exe/CMakeLists.txt

@@ -1,5 +1,7 @@
 FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
+SOURCE_GROUP("" FILES ${SRC})
+
 ADD_DEFINITIONS(${MFC_DEFINITIONS})
 SET(CMAKE_MFC_FLAG 2)
 ADD_EXECUTABLE(georges WIN32 ${SRC})

code/ryzom/tools/leveldesign/georges_exe/georges_exe.rc

@@ -52,7 +52,7 @@ END
 
 3 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -68,7 +68,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/ryzom/tools/leveldesign/georges_exe/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "Ryzom Georges Edit"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "georges" NL_FILEEXT ".exe"
+            VALUE "ProductName", "Ryzom Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/ryzom/tools/leveldesign/mission_compiler_fe/Resource.h

@@ -12,7 +12,6 @@
 #define IDR_MENU1                       131
 #define IDD_DIALOG_ADD_PATH             132
 #define IDD_DIALOG_MODE                 133
-#define IDS_VERSIONTEXT                 140
 #define IDC_LIST_SRC                    1000
 #define IDC_LIST_DST                    1001
 #define IDC_ADD                         1002

code/ryzom/tools/leveldesign/mission_compiler_fe/version.rc2

@@ -47,18 +47,13 @@ BEGIN
     END
 END
 
-STRINGTABLE
-BEGIN
-    IDS_VERSIONTEXT "Ryzom Mission Compiler Frontend " NL_VERSION
-END
-
 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 235, 55
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About Ryzom Mission Compiler Frontend"
 FONT 8, "MS Sans Serif"
 BEGIN
     ICON            IDR_MAINFRAME,IDC_STATIC,11,17,20,20
-    LTEXT           IDS_VERSIONTEXT,IDC_STATIC,40,10,119,8,SS_NOPREFIX
+    LTEXT           NL_VERSION,IDC_STATIC,40,10,119,8,SS_NOPREFIX
     LTEXT           COPYRIGHT,IDC_STATIC,40,25,119,8
     DEFPUSHBUTTON   "OK",IDOK,178,7,50,14,WS_GROUP
 END

code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/export_cb_dlg.cpp ${CMAKE_CURRENT_SOURCE_DIR}/builder_logic.cpp)
 
@@ -6,12 +8,10 @@ ENABLE_LANGUAGE(RC)
 ADD_DEFINITIONS(${MFC_DEFINITIONS})
 SET(CMAKE_MFC_FLAG 2)
 
-ADD_EXECUTABLE(world_editor WIN32 ${SRC} world_editor.rc)
+ADD_EXECUTABLE(world_editor WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 
-SOURCE_GROUP(Resources FILES world_editor.rc)
-
 TARGET_LINK_LIBRARIES(world_editor	
 					nelmisc
 					nelligo

code/ryzom/tools/leveldesign/world_editor/world_editor/version.rc2

@@ -0,0 +1,64 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NL_VERSION_RC
+ PRODUCTVERSION NL_VERSION_RC
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "Ryzom World Editor"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "world_editor" NL_FILEEXT ".exe"
+            VALUE "ProductName", "Ryzom Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 235, 73
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "About World Editor"
+FONT 8, "MS Sans Serif"
+BEGIN
+    ICON            IDR_MAINFRAME,IDC_STATIC,11,17,20,20
+    LTEXT           NL_VERSION,IDC_TITLE_VERSION,40,10,96,8,SS_NOPREFIX
+    LTEXT           COPYRIGHT,IDC_STATIC,40,25,119,8
+    DEFPUSHBUTTON   "OK",IDOK,178,8,50,14,WS_GROUP
+    LTEXT           "Allocated Video Mem :",IDC_STATIC,15,43,73,16
+    LTEXT           "Static",IDC_STATIC_VIDEO_MEM,97,43,87,16
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.rc

@@ -54,6 +54,8 @@ BEGIN
     "#include ""afxprint.rc""       // printing/print preview resources\r\n"
     "#include ""afxdb.rc""          // Database resources\r\n"
     "#endif\r\n"
+    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -367,20 +369,6 @@ END
 // Dialog
 //
 
-IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 235, 73
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "About NeL World Editor"
-FONT 8, "MS Sans Serif"
-BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,11,17,20,20
-    LTEXT           "NeL World Editor Version 0.47",IDC_TITLE_VERSION,40,10,
-                    96,8,SS_NOPREFIX
-    LTEXT           "Copyright Nevrax (C) 2005",IDC_STATIC,40,25,119,8
-    DEFPUSHBUTTON   "OK",IDOK,178,8,50,14,WS_GROUP
-    LTEXT           "Allocated Video Mem :",IDC_STATIC,15,43,73,16
-    LTEXT           "Static",IDC_STATIC_VIDEO_MEM,97,43,87,16
-END
-
 IDD_CREATE_ELEMENT DIALOG DISCARDABLE  0, 0, 247, 47
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Create Element"
@@ -801,52 +789,6 @@ BEGIN
 END
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Nevrax\0"
-            VALUE "FileDescription", "NeL World Editor\0"
-            VALUE "FileVersion", "0, 0, 0, 1\0"
-            VALUE "InternalName", "world_editor\0"
-            VALUE "LegalCopyright", "Nevrax Copyright (C) 2002\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "world_editor.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "NeL World Editor\0"
-            VALUE "ProductVersion", "0, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -1251,6 +1193,8 @@ LANGUAGE 9, 1
 #include "afxdb.rc"          // Database resources
 #endif
 
+#include "version.rc2"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED