Version bump to 1.4.1

shysaur · Dec 23, 2019 · a05192e · a05192e
1 parent b41b5fb
commit a05192e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/M68kSimApp/M68kSimApp/Info.plist b/M68kSimApp/M68kSimApp/Info.plist
@@ -63,7 +63,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/M68kSimApp/Tricky68k.xcodeproj/project.pbxproj b/M68kSimApp/Tricky68k.xcodeproj/project.pbxproj
@@ -1559,6 +1559,7 @@
 				);
 				INFOPLIST_FILE = M68kSimApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MARKETING_VERSION = 1.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.danielecattaneo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = Tricky68k;
 				SDKROOT = macosx;
@@ -1576,6 +1577,7 @@
 				);
 				INFOPLIST_FILE = M68kSimApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MARKETING_VERSION = 1.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.danielecattaneo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = Tricky68k;
 				SDKROOT = macosx;

diff --git a/Motorola68kPlatform/m68ksim/m68ksim/m68ksim.c b/Motorola68kPlatform/m68ksim/m68ksim/m68ksim.c
@@ -48,7 +48,7 @@ pthread_mutex_t cpu_timerMut;
 
 void printVersion(FILE *fp) {
   const char *ver =
-    "m68ksim, version 1.2.1, using Musashi version 3.4 (c641acd)\n"
+    "m68ksim, version 1.2.2, using Musashi version 4.60 (6f04ba0)\n"
     "(c) 2014-19 Daniele Cattaneo; (c) 1998-2019 Karl Stenerud.\n";
   fputs(ver, fp);
 }