diff --git a/iOS/salmontemplate.xcodeproj/project.pbxproj b/iOS/salmontemplate.xcodeproj/project.pbxproj index 3d6aa00..54952c6 100644 --- a/iOS/salmontemplate.xcodeproj/project.pbxproj +++ b/iOS/salmontemplate.xcodeproj/project.pbxproj @@ -30,6 +30,7 @@ 4C77831915BABE26003D5142 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831515BABD8B003D5142 /* OpenAL.framework */; }; 4C7AD44C15B1D77700A599F6 /* ios_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7AD44B15B1D77700A599F6 /* ios_api.cpp */; }; 4C7C584B15C31E6500CAE4F4 /* libboost.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C7C584A15C31E6500CAE4F4 /* libboost.a */; }; + 4CBCD3EE1754F276006831C9 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCD3ED1754F276006831C9 /* libjpeg.a */; }; 4CC971AC15C57DCE00359A2B /* libSalmon Engine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C902A7815C5735700FBC901 /* libSalmon Engine.a */; }; 4CCC0ECC15B30D6B005432FB /* CustomGLKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4CCC0ECB15B30D6B005432FB /* CustomGLKView.mm */; }; 4CE6A9D215B2F979006A3965 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 4CE6A9D115B2F979006A3965 /* assets */; }; @@ -76,6 +77,7 @@ 4C7AD44B15B1D77700A599F6 /* ios_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ios_api.cpp; sourceTree = ""; }; 4C7C584A15C31E6500CAE4F4 /* libboost.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost.a; path = "../../libs/boost_1_47_0/build-ios/ios-simulator/libboost.a"; sourceTree = ""; }; 4C902A7015C5735500FBC901 /* Salmon Engine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Salmon Engine.xcodeproj"; path = "../../Engine/iOS/Salmon Engine/Salmon Engine.xcodeproj"; sourceTree = ""; }; + 4CBCD3ED1754F276006831C9 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../libs/jpeg-9/build-ios/ios-device/libjpeg.a"; sourceTree = ""; }; 4CCC0ECA15B30D6A005432FB /* CustomGLKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomGLKView.h; sourceTree = ""; }; 4CCC0ECB15B30D6B005432FB /* CustomGLKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CustomGLKView.mm; sourceTree = ""; }; 4CCC0ECD15B310FB005432FB /* ios_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ios_api.h; sourceTree = ""; }; @@ -87,6 +89,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4CBCD3EE1754F276006831C9 /* libjpeg.a in Frameworks */, 4CC971AC15C57DCE00359A2B /* libSalmon Engine.a in Frameworks */, 4C77831815BABE26003D5142 /* AudioToolbox.framework in Frameworks */, 4C77831915BABE26003D5142 /* OpenAL.framework in Frameworks */, @@ -173,6 +176,7 @@ 4C7B819515C40F770024D61A /* Libs */ = { isa = PBXGroup; children = ( + 4CBCD3ED1754F276006831C9 /* libjpeg.a */, 4C6EB44415C3CFD300316CB6 /* libpng.a */, 4C7C584A15C31E6500CAE4F4 /* libboost.a */, 4C77831215BABD68003D5142 /* libvorbis-tremor-ios.a */, @@ -403,15 +407,21 @@ "$(LibsPath)/boost_1_52_0", ../jni, "$(LibsPath)/vorbis-tremor-ios/vorbis", + "$(LibsPath)/jpeg-9", + "$(LibsPath)/jpeg-9/vc10", ); INFOPLIST_FILE = "template-Info.plist"; - LIBRARY_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../../../libs/jpeg-9/build-ios/ios-device\"", + ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = ( "$(LibsPath)/lpng1510/build-ios/ios-device", "$(LibsPath)/boost_1_52_0/build-ios/ios-device", "$(LibsPath)/sqplus/build-ios/ios-device", "$(LibsPath)/zlib-1.2.6/build-ios/ios-device", "$(LibsPath)/vorbis-tremor-ios/build-ios/ios-device", + "$(LibsPath)/jpeg-9/build-ios/ios-device", ); "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = ( "$(LibsPath)/lpng1510/build-ios/ios-simulator", @@ -419,6 +429,7 @@ "$(LibsPath)/boost_1_52_0/build-ios/ios-simulator", "$(LibsPath)/zlib-1.2.6/build-ios/ios-simulator", "$(LibsPath)/vorbis-tremor-ios/build-ios/ios-simulator", + "$(LibsPath)/jpeg-9/build-ios/ios-simulator", ); PRODUCT_NAME = "$(TARGET_NAME)"; SYMROOT = build; @@ -450,15 +461,21 @@ "$(LibsPath)/boost_1_52_0", ../jni, "$(LibsPath)/vorbis-tremor-ios/vorbis", + "$(LibsPath)/jpeg-9", + "$(LibsPath)/jpeg-9/vc10", ); INFOPLIST_FILE = "template-Info.plist"; - LIBRARY_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../../../libs/jpeg-9/build-ios/ios-device\"", + ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = ( "$(LibsPath)/lpng1510/build-ios/ios-device", "$(LibsPath)/boost_1_52_0/build-ios/ios-device", "$(LibsPath)/sqplus/build-ios/ios-device", "$(LibsPath)/zlib-1.2.6/build-ios/ios-device", "$(LibsPath)/vorbis-tremor-ios/build-ios/ios-device", + "$(LibsPath)/jpeg-9/build-ios/ios-device", ); "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = ( "$(LibsPath)/lpng1510/build-ios/ios-simulator", @@ -466,6 +483,7 @@ "$(LibsPath)/boost_1_52_0/build-ios/ios-simulator", "$(LibsPath)/zlib-1.2.6/build-ios/ios-simulator", "$(LibsPath)/vorbis-tremor-ios/build-ios/ios-simulator", + "$(LibsPath)/jpeg-9/build-ios/ios-simulator", ); PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 1;