From 3a6e4aeff4b2ee100c6925f4f71fcd67495862b2 Mon Sep 17 00:00:00 2001
From: Struma <strix@struma.me>
Date: Wed, 11 Mar 2020 13:55:47 -0400
Subject: [PATCH] bump version to 1.2.2

---
 macos/Info.plist    |  2 +-
 meson.build         |  6 +++++-
 mkxp.json.sample    | 14 +-------------
 windows/resource.rc |  8 ++++----
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/macos/Info.plist b/macos/Info.plist
index 6cb52ced..de3caf35 100644
--- a/macos/Info.plist
+++ b/macos/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleIconFile</key>
 	<string>icon.icns</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/meson.build b/meson.build
index ab07f836..a93ec481 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('mkxp-z', 'c', 'cpp', 'objc', 'objcpp', version: '1.2.0', meson_version: '>=0.47.0', default_options: ['cpp_std=c++11', 'buildtype=release', 'warning_level=0'])
+project('mkxp-z', 'c', 'cpp', 'objc', 'objcpp', version: '1.2.2', meson_version: '>=0.47.0', default_options: ['cpp_std=c++11', 'buildtype=release', 'warning_level=0'])
 
 minimum_macos_version = get_option('macos_min_version')
 
@@ -170,6 +170,10 @@ if steamworks == true
         shim_args += '-DSTEAM_APPID=' + get_option('steam_appid')
     endif
 
+    if get_option('console') == true
+        shim_args += '-DSTEAMSHIM_DEBUG'
+    endif
+
     executable(meson.project_name(),
         sources: files('steamshim/steamshim_parent.cpp'),
         dependencies: steamlib,
diff --git a/mkxp.json.sample b/mkxp.json.sample
index 55a9103d..0f8da5e2 100644
--- a/mkxp.json.sample
+++ b/mkxp.json.sample
@@ -332,18 +332,6 @@
     // "Game.rgssad", but specifying the executable name here
     // is a tiny bit less intrusive.
     //
-    // "execName": "Game",
-
-    // The game's Steam AppID.
-    //
-    // If the ID was specified at build time, this setting is
-    // ignored. If the ID is specified neither here nor in
-    // the build itself, the program will raise an error
-    // at startup.
-    //
-    // Only has an effect if mkxp-z was built with
-    // Steam support.
-    //
-    // "steamAppId": 0
+    // "execName": "Game"
 
 }
diff --git a/windows/resource.rc b/windows/resource.rc
index b96d8a82..83b4c630 100644
--- a/windows/resource.rc
+++ b/windows/resource.rc
@@ -4,17 +4,17 @@
 IDI_APPICON ICON "icon.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    1,2,1,0
-PRODUCTVERSION 1,2,1,0
+FILEVERSION    1,2,2,0
+PRODUCTVERSION 1,2,2,0
 {
 BLOCK "StringFileInfo"
 {
 BLOCK "040904b0"
 {
-VALUE "FileVersion",        "1.2.1\0"
+VALUE "FileVersion",        "1.2.2\0"
 VALUE "OriginalFilename",   "mkxp-z.exe\0"
 VALUE "ProductName",        "mkxp-z\0"
-VALUE "ProductVersion",     "1.2.1\0"
+VALUE "ProductVersion",     "1.2.2\0"
 }
 }
 BLOCK "VarFileInfo"