From 157d7637ed22be0364cea521fcbd7db4787a3c46 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 23 Dec 2019 17:17:51 -0400 Subject: [PATCH] Update version to 12.0 --HG-- branch : minor --- extra/appveyor/appveyor.yml | 2 +- extra/windows/love.rc | Bin 3632 -> 3632 bytes platform/unix/configure.ac | 2 +- platform/unix/love.6 | 2 +- platform/xcode/ios/love-ios.plist | 2 +- platform/xcode/love.xcodeproj/project.pbxproj | 6 ++++++ platform/xcode/macosx/liblove-macosx.plist | 2 +- platform/xcode/macosx/love-macosx.plist | 2 +- src/common/version.h | 10 +++++----- 9 files changed, 17 insertions(+), 11 deletions(-) diff --git a/extra/appveyor/appveyor.yml b/extra/appveyor/appveyor.yml index e27f36702..5db294e6d 100644 --- a/extra/appveyor/appveyor.yml +++ b/extra/appveyor/appveyor.yml @@ -1,4 +1,4 @@ -version: 11.3.{build} +version: 12.0.{build} image: Visual Studio 2019 diff --git a/extra/windows/love.rc b/extra/windows/love.rc index 779f1d3ae6b4594d9638e0f06b1620c10be47770..283ee808b44de6c4ecefa315c5066dc21cdd781a 100644 GIT binary patch delta 42 ucmdlWvq5Hq0t>qlgC2tcgVN+i7Wv6;EPRYcV3r;`7qbF`!RAJm^_&3KunETi delta 42 ucmdlWvq5Hq0t>q#gC2u1gVN+i7Wv6;EPRZHV3r;`7qbF`@#aRB^_&3K=n2aJ diff --git a/platform/unix/configure.ac b/platform/unix/configure.ac index b682fc03c..c591797cd 100644 --- a/platform/unix/configure.ac +++ b/platform/unix/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([love], [11.3]) +AC_INIT([love], [12.0]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([platform/unix]) AC_CONFIG_MACRO_DIR([platform/unix/m4]) diff --git a/platform/unix/love.6 b/platform/unix/love.6 index b621dd229..4e3516d81 100644 --- a/platform/unix/love.6 +++ b/platform/unix/love.6 @@ -12,7 +12,7 @@ .\" 3. This notice may not be removed or altered from any source distribution. .Dd March 31, 2018 .Dt LOVE 6 -.Os LÖVE 11.3 +.Os LÖVE 12.0 .Sh NAME .Nm love .Nd 2D game development framework diff --git a/platform/xcode/ios/love-ios.plist b/platform/xcode/ios/love-ios.plist index 6abf7e335..21b2c64e5 100644 --- a/platform/xcode/ios/love-ios.plist +++ b/platform/xcode/ios/love-ios.plist @@ -36,7 +36,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 11.3 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion diff --git a/platform/xcode/love.xcodeproj/project.pbxproj b/platform/xcode/love.xcodeproj/project.pbxproj index ced4c310d..90f8240de 100644 --- a/platform/xcode/love.xcodeproj/project.pbxproj +++ b/platform/xcode/love.xcodeproj/project.pbxproj @@ -461,6 +461,7 @@ INFOPLIST_FILE = "macosx/love-macosx.plist"; INSTALL_PATH = /Applications; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MARKETING_VERSION = 12.0; PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; }; @@ -493,6 +494,7 @@ INFOPLIST_FILE = "macosx/love-macosx.plist"; INSTALL_PATH = /Applications; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MARKETING_VERSION = 12.0; PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; }; @@ -702,6 +704,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/ios/love-ios.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 12.0; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; @@ -748,6 +751,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/ios/love-ios.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 12.0; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; @@ -795,6 +799,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/ios/love-ios.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 12.0; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; @@ -915,6 +920,7 @@ INFOPLIST_FILE = "macosx/love-macosx.plist"; INSTALL_PATH = /Applications; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MARKETING_VERSION = 12.0; PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; }; diff --git a/platform/xcode/macosx/liblove-macosx.plist b/platform/xcode/macosx/liblove-macosx.plist index b76e815fe..48b50ba12 100644 --- a/platform/xcode/macosx/liblove-macosx.plist +++ b/platform/xcode/macosx/liblove-macosx.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 11.3 + 12.0 CFBundleSignature LoVe NSPrincipalClass diff --git a/platform/xcode/macosx/love-macosx.plist b/platform/xcode/macosx/love-macosx.plist index 4efa7ff90..e9dfcbc72 100644 --- a/platform/xcode/macosx/love-macosx.plist +++ b/platform/xcode/macosx/love-macosx.plist @@ -62,7 +62,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 11.3 + $(MARKETING_VERSION) CFBundleSignature LoVe LSApplicationCategoryType diff --git a/src/common/version.h b/src/common/version.h index f4341f660..72e898650 100644 --- a/src/common/version.h +++ b/src/common/version.h @@ -25,13 +25,13 @@ namespace love { // Version stuff. -#define LOVE_VERSION_STRING "11.3" -static const int VERSION_MAJOR = 11; -static const int VERSION_MINOR = 3; +#define LOVE_VERSION_STRING "12.0" +static const int VERSION_MAJOR = 12; +static const int VERSION_MINOR = 0; static const int VERSION_REV = 0; static const char *VERSION = LOVE_VERSION_STRING; -static const char *VERSION_COMPATIBILITY[] = { VERSION, "11.0", "11.1", "11.2", 0 }; -static const char *VERSION_CODENAME = "Mysterious Mysteries"; +static const char *VERSION_COMPATIBILITY[] = { VERSION, 0 }; +static const char *VERSION_CODENAME = ""; } // love