diff --git a/extra/appveyor/appveyor.yml b/extra/appveyor/appveyor.yml index b081aa9a3..639d824db 100644 --- a/extra/appveyor/appveyor.yml +++ b/extra/appveyor/appveyor.yml @@ -1,4 +1,4 @@ -version: 11.3.{build} +version: 11.4.{build} image: Visual Studio 2013 diff --git a/extra/windows/love.rc b/extra/windows/love.rc index dd0b6b997..fc8777529 100644 Binary files a/extra/windows/love.rc and b/extra/windows/love.rc differ diff --git a/platform/unix/love.6 b/platform/unix/love.6 index b621dd229..a2eb4c3d6 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 11.4 .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/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index 1abcea551..0b3dbf5be 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -5330,6 +5330,7 @@ "$(inherited)", "$(PROJECT_DIR)/ios/libraries/freetype", ); + MARKETING_VERSION = 11.4; OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, @@ -5373,6 +5374,7 @@ "$(inherited)", "$(PROJECT_DIR)/ios/libraries/freetype", ); + MARKETING_VERSION = 11.4; OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, @@ -5417,6 +5419,7 @@ "$(inherited)", "$(PROJECT_DIR)/ios/libraries/freetype", ); + MARKETING_VERSION = 11.4; OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, diff --git a/platform/xcode/love.xcodeproj/project.pbxproj b/platform/xcode/love.xcodeproj/project.pbxproj index 20e6eb592..67ea81532 100644 --- a/platform/xcode/love.xcodeproj/project.pbxproj +++ b/platform/xcode/love.xcodeproj/project.pbxproj @@ -462,6 +462,7 @@ INFOPLIST_FILE = "macosx/love-macosx.plist"; INSTALL_PATH = /Applications; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MARKETING_VERSION = 11.4; PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; }; @@ -495,6 +496,7 @@ INFOPLIST_FILE = "macosx/love-macosx.plist"; INSTALL_PATH = /Applications; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MARKETING_VERSION = 11.4; PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; }; @@ -704,6 +706,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/ios/love-ios.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 11.4; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; @@ -750,6 +753,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/ios/love-ios.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 11.4; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; @@ -797,6 +801,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/ios/love-ios.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 11.4; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; @@ -918,6 +923,7 @@ INFOPLIST_FILE = "macosx/love-macosx.plist"; INSTALL_PATH = /Applications; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MARKETING_VERSION = 11.4; 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..606144ce4 100644 --- a/platform/xcode/macosx/liblove-macosx.plist +++ b/platform/xcode/macosx/liblove-macosx.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 11.3 + $(MARKETING_VERSION) CFBundleSignature LoVe NSPrincipalClass diff --git a/platform/xcode/macosx/love-macosx.plist b/platform/xcode/macosx/love-macosx.plist index 479346944..a59b85fe2 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 f72740fcd..b41a3d083 100644 --- a/src/common/version.h +++ b/src/common/version.h @@ -25,12 +25,12 @@ namespace love { // Version stuff. -#define LOVE_VERSION_STRING "11.3" +#define LOVE_VERSION_STRING "11.4" static const int VERSION_MAJOR = 11; -static const int VERSION_MINOR = 3; +static const int VERSION_MINOR = 4; 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_COMPATIBILITY[] = { VERSION, "11.0", "11.1", "11.2", "11.3", 0 }; static const char *VERSION_CODENAME = "Mysterious Mysteries"; } // love