From cdc019b96b67bf9c87efef63565c26c190ec44b4 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Tue, 15 Dec 2015 14:03:44 -0400 Subject: [PATCH] libmodplug is now used on iOS. --- .../AppIcon.appiconset/Contents.json | 6 +++++ .../AppIcon.appiconset/pig-83.5pt@2x.png | Bin 0 -> 17026 bytes .../xcode/liblove.xcodeproj/project.pbxproj | 24 +++++++++++++++--- src/modules/sound/lullaby/ModPlugDecoder.h | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-83.5pt@2x.png diff --git a/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/Contents.json b/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/Contents.json index 164ff34d6..d58677a9b 100644 --- a/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/Contents.json @@ -113,6 +113,12 @@ "idiom" : "ipad", "filename" : "pig-76pt@2x.png", "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "pig-83.5pt@2x.png", + "scale" : "2x" } ], "info" : { diff --git a/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-83.5pt@2x.png b/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-83.5pt@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..78c9f8c8823ecf75be6db19c9e0f1b3e09d37e54 GIT binary patch literal 17026 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 HLE!%fGyeF{ literal 0 HcmV?d00001 diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index 904d0297c..5a25f7641 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -845,6 +845,8 @@ FA41A3CA1C0A1F950084430C /* ASTCHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = FA41A3C71C0A1F950084430C /* ASTCHandler.h */; }; FA4B66C91ABBCF1900558F15 /* Timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4B66C81ABBCF1900558F15 /* Timer.cpp */; }; FA4B66CA1ABBCF1900558F15 /* Timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4B66C81ABBCF1900558F15 /* Timer.cpp */; }; + FA56D9BB1C2089EE00D8D3C7 /* libmodplug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA56D9BA1C2089EE00D8D3C7 /* libmodplug.a */; }; + FA56D9BC1C208A0200D8D3C7 /* libmodplug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA56D9BA1C2089EE00D8D3C7 /* libmodplug.a */; }; FA577AB016C7507900860150 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA577A7916C71A1700860150 /* Cocoa.framework */; }; FA577AC216C7512D00860150 /* FreeType.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA577A6716C719D900860150 /* FreeType.framework */; }; FA577AC516C7513400860150 /* libmodplug.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA577A8216C71A5300860150 /* libmodplug.framework */; }; @@ -1522,6 +1524,7 @@ FA41A3C61C0A1F950084430C /* ASTCHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ASTCHandler.cpp; sourceTree = ""; }; FA41A3C71C0A1F950084430C /* ASTCHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASTCHandler.h; sourceTree = ""; }; FA4B66C81ABBCF1900558F15 /* Timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Timer.cpp; sourceTree = ""; }; + FA56D9BA1C2089EE00D8D3C7 /* libmodplug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmodplug.a; sourceTree = ""; }; FA577A6716C719D900860150 /* FreeType.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FreeType.framework; path = /Library/Frameworks/FreeType.framework; sourceTree = ""; }; FA577A6D16C719EA00860150 /* Lua.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Lua.framework; path = /Library/Frameworks/Lua.framework; sourceTree = ""; }; FA577A6F16C719F000860150 /* mpg123.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mpg123.framework; path = /Library/Frameworks/mpg123.framework; sourceTree = ""; }; @@ -1583,6 +1586,7 @@ FA5D24B51A96D2EC00C6FC8F /* libvorbis.a in Frameworks */, FA5D24B31A96D2EC00C6FC8F /* libogg.a in Frameworks */, FA59A2D81C0649C200328DBA /* libtheora.a in Frameworks */, + FA56D9BC1C208A0200D8D3C7 /* libmodplug.a in Frameworks */, FA5D24B01A96D2EC00C6FC8F /* libFreetype2.a in Frameworks */, FA5D24B41A96D2EC00C6FC8F /* libphysfs.a in Frameworks */, FA7550A81AEBE276003E311E /* libluajit.a in Frameworks */, @@ -1598,6 +1602,7 @@ FA317EBA18F28B6D00B0BCD7 /* libz.dylib in Frameworks */, FAA627CE18E7E1560080752D /* CoreServices.framework in Frameworks */, FA9B4A0816E1578300074F42 /* SDL2.framework in Frameworks */, + FA56D9BB1C2089EE00D8D3C7 /* libmodplug.a in Frameworks */, FAAFF04416CB11C700CCDE45 /* OpenAL-Soft.framework in Frameworks */, FA577AB016C7507900860150 /* Cocoa.framework in Frameworks */, FA577AC216C7512D00860150 /* FreeType.framework in Frameworks */, @@ -2809,6 +2814,15 @@ path = theora; sourceTree = ""; }; + FA56D9B91C2089CE00D8D3C7 /* modplug */ = { + isa = PBXGroup; + children = ( + FA56D9BA1C2089EE00D8D3C7 /* libmodplug.a */, + ); + name = modplug; + path = ios/libraries/modplug; + sourceTree = ""; + }; FA577A6616C7199700860150 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -2839,6 +2853,7 @@ children = ( FA5D24A41A96D2EC00C6FC8F /* freetype */, FA7550A61AEBE250003E311E /* luajit */, + FA56D9B91C2089CE00D8D3C7 /* modplug */, FA5D24AA1A96D2EC00C6FC8F /* ogg */, FA5D24AC1A96D2EC00C6FC8F /* physfs */, FA5D24CC1A96E63D00C6FC8F /* SDL2 */, @@ -4002,7 +4017,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", LOVE_SUPPORT_COREAUDIO, - LOVE_NO_MODPLUG, LOVE_NOMPG123, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; @@ -4013,6 +4027,7 @@ ios/include/luajit, ios/include/freetype, ios/include/SDL2, + ios/include/modplug, ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -4024,6 +4039,7 @@ "$(PROJECT_DIR)/ios/libraries/SDL2", "$(PROJECT_DIR)/ios/libraries/luajit", "$(PROJECT_DIR)/ios/libraries/theora", + "$(PROJECT_DIR)/ios/libraries/modplug", ); MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = "-ObjC"; @@ -4043,7 +4059,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", LOVE_SUPPORT_COREAUDIO, - LOVE_NO_MODPLUG, LOVE_NOMPG123, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; @@ -4053,6 +4068,7 @@ ios/include/luajit, ios/include/freetype, ios/include/SDL2, + ios/include/modplug, ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -4064,6 +4080,7 @@ "$(PROJECT_DIR)/ios/libraries/SDL2", "$(PROJECT_DIR)/ios/libraries/luajit", "$(PROJECT_DIR)/ios/libraries/theora", + "$(PROJECT_DIR)/ios/libraries/modplug", ); MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-ObjC"; @@ -4084,7 +4101,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", LOVE_SUPPORT_COREAUDIO, - LOVE_NO_MODPLUG, LOVE_NOMPG123, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; @@ -4094,6 +4110,7 @@ ios/include/luajit, ios/include/freetype, ios/include/SDL2, + ios/include/modplug, ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -4105,6 +4122,7 @@ "$(PROJECT_DIR)/ios/libraries/SDL2", "$(PROJECT_DIR)/ios/libraries/luajit", "$(PROJECT_DIR)/ios/libraries/theora", + "$(PROJECT_DIR)/ios/libraries/modplug", ); MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-ObjC"; diff --git a/src/modules/sound/lullaby/ModPlugDecoder.h b/src/modules/sound/lullaby/ModPlugDecoder.h index 9b7fb853c..f50c37d89 100644 --- a/src/modules/sound/lullaby/ModPlugDecoder.h +++ b/src/modules/sound/lullaby/ModPlugDecoder.h @@ -30,7 +30,7 @@ #include "Decoder.h" // libmodplug -#ifdef LOVE_ANDROID +#if defined(LOVE_ANDROID) || defined(LOVE_IOS) #include #else #include