From 93fcab952b28f4db39d9326b83f14cbd86c0cf17 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Fri, 27 Feb 2015 18:05:29 -0500
Subject: Clean up and tweak build system

  * Combine client and server man pages.
  * Update unit test options and available databases in man page.
  * Add `--worldname` to man page.
  * Fix a bunch of places where `"Minetest"` was used directly instead of `PROJECT_NAME`.
  * Disable server build by default on all operating systems.
  * Make `ENABLE_FREETYPE` not fail if FreeType isn't found.
  * Enable LevelDB, Redis, and FreeType detection by default.
  * Remove the `VERSION_PATCH_ORIG` hack.
  * Add option to search for and use system JSONCPP.
  * Remove broken LuaJIT version detection.
  * Rename `DISABLE_LUAJIT` to `ENABLE_LUAJIT`.
  * Rename `minetest_*` variables in `version.{h,cpp}` to `g_*`.
  * Clean up style of CMake files.
---
 misc/winresource.rc | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'misc')

diff --git a/misc/winresource.rc b/misc/winresource.rc
index ecb314c12..5f214391a 100644
--- a/misc/winresource.rc
+++ b/misc/winresource.rc
@@ -5,10 +5,10 @@
 #include "config.h"
 #undef USE_CMAKE_CONFIG_H
 
-#if RUN_IN_PLACE == 1
-	#define BUILDMODE "RUN_IN_PLACE=1\0"
+#if RUN_IN_PLACE
+	#define BUILDMODE "RUN_IN_PLACE=1"
 #else
-	#define BUILDMODE "RUN_IN_PLACE=0\0"
+	#define BUILDMODE "RUN_IN_PLACE=0"
 #endif
 
 LANGUAGE 0, SUBLANG_NEUTRAL
@@ -20,8 +20,8 @@ LANGUAGE 0, SUBLANG_NEUTRAL
 //
 
 1 VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH_ORIG,0
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH_ORIG,0
+ FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
+ PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
  FILEFLAGSMASK 0x3fL
 #ifndef NDEBUG
  FILEFLAGS 0x1L
@@ -36,16 +36,16 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
     BEGIN
-        VALUE "Comments", "\0"
-        VALUE "CompanyName", "Minetest Community\0"
-        VALUE "FileDescription", "Minetest engine core main application\0"
+        VALUE "Comments", ""
+        VALUE "CompanyName", PROJECT_NAME " community"
+        VALUE "FileDescription", PROJECT_NAME " engine main executable"
         VALUE "FileVersion", VERSION_STRING
-        VALUE "InternalName", "Minetest engine\0"
-        VALUE "LegalCopyright", "(c) 2014 celeron55\0"
-        VALUE "LegalTrademarks", """Minetest"" is property of Minetest community, don't use the name for your application without permission!\0"
-        VALUE "OriginalFilename", "minetest.exe\0"
-        VALUE "PrivateBuild", VERSION_EXTRA_STRING
-        VALUE "ProductName", "Minetest\0"
+        VALUE "InternalName", PROJECT_NAME
+        VALUE "LegalCopyright", "(c) 2014 celeron55"
+        VALUE "LegalTrademarks", """Minetest"" is the property of the Minetest community, don't use it without permission!"
+        VALUE "OriginalFilename", "minetest.exe"
+        VALUE "PrivateBuild", VERSION_EXTRA
+        VALUE "ProductName", PROJECT_NAME
         VALUE "ProductVersion", PRODUCT_VERSION_STRING
         VALUE "SpecialBuild", BUILDMODE
     END
@@ -55,3 +55,4 @@ BEGIN
     VALUE "Translation", 0x409, 1200
 END
 END
+
-- 
cgit v1.2.3