[TIMOB-18092] Fixed linker error when building with TiSDK 3.5.0+

jonalter · Jan 10, 2015 · f5565b6 · f5565b6
1 parent c94c439
commit f5565b6
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 6 deletions.
diff --git a/ios/RedLaserLib/libRedLaserSDK.a b/ios/RedLaserLib/libRedLaserSDK.a
diff --git a/ios/documentation/changelog.md b/ios/documentation/changelog.md
@@ -1,5 +1,7 @@
 # Change Log
 <pre>
+v1.3.1  [TIMOB-18092] Fixed linker error when building with TiSDK 3.5.0+
+
 v1.3.0  [TIMOB-18092] Updated to build for 64bit
 
 v1.2.0  Updated RedLaser iOS SDK to 3.5.2

diff --git a/ios/manifest b/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.3.0
+version: 1.3.1
 apiversion: 2
 architectures: armv7 i386 x86_64 arm64
 description: RedLaser Module

diff --git a/ios/module.xcconfig b/ios/module.xcconfig
@@ -10,7 +10,7 @@
 //
 // How to add a Framework (example)
 //
-OTHER_LDFLAGS=$(inherited) -framework UIKit -framework Foundation -framework QuartzCore -framework CoreVideo -framework CoreMedia -framework CoreGraphics -framework AVFoundation -framework OpenGLES -framework Security -lstdc++ -liconv
+OTHER_LDFLAGS=$(inherited) -framework UIKit -framework Foundation -framework QuartzCore -framework CoreVideo -framework CoreMedia -framework CoreGraphics -framework AVFoundation -framework OpenGLES -framework Security -lstdc++.6.0.9 -liconv
 //
 // Adding a framework for a specific version(s) of iPhone:
 //

diff --git a/ios/redlaser.xcodeproj/project.pbxproj b/ios/redlaser.xcodeproj/project.pbxproj
@@ -27,7 +27,6 @@
 		24DE9E1111C5FE74003F90F6 /* TiRedlaserModuleAssets.h in Headers */ = {isa = PBXBuildFile; fileRef = 24DE9E0F11C5FE74003F90F6 /* TiRedlaserModuleAssets.h */; };
 		24DE9E1211C5FE74003F90F6 /* TiRedlaserModuleAssets.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DE9E1011C5FE74003F90F6 /* TiRedlaserModuleAssets.m */; };
 		747FD7F519D1D56F003C512A /* libRedLaserSDK_arm64.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 747FD7F419D1D56F003C512A /* libRedLaserSDK_arm64.a */; };
-		8F534CD316420747001D00EB /* libRedLaserSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F534CD116420747001D00EB /* libRedLaserSDK.a */; };
 		8F534CD416420748001D00EB /* RedLaserSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F534CD216420747001D00EB /* RedLaserSDK.h */; };
 		8F534CDB1642C0AA001D00EB /* BarcodeResultProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F534CD91642C0AA001D00EB /* BarcodeResultProxy.h */; };
 		8F534CDC1642C0AA001D00EB /* BarcodeResultProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F534CDA1642C0AA001D00EB /* BarcodeResultProxy.m */; };
@@ -57,7 +56,6 @@
 		24DE9E0F11C5FE74003F90F6 /* TiRedlaserModuleAssets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TiRedlaserModuleAssets.h; path = Classes/TiRedlaserModuleAssets.h; sourceTree = "<group>"; };
 		24DE9E1011C5FE74003F90F6 /* TiRedlaserModuleAssets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TiRedlaserModuleAssets.m; path = Classes/TiRedlaserModuleAssets.m; sourceTree = "<group>"; };
 		747FD7F419D1D56F003C512A /* libRedLaserSDK_arm64.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libRedLaserSDK_arm64.a; sourceTree = "<group>"; };
-		8F534CD116420747001D00EB /* libRedLaserSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libRedLaserSDK.a; sourceTree = "<group>"; };
 		8F534CD216420747001D00EB /* RedLaserSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RedLaserSDK.h; sourceTree = "<group>"; };
 		8F534CD91642C0AA001D00EB /* BarcodeResultProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BarcodeResultProxy.h; path = Classes/BarcodeResultProxy.h; sourceTree = "<group>"; };
 		8F534CDA1642C0AA001D00EB /* BarcodeResultProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BarcodeResultProxy.m; path = Classes/BarcodeResultProxy.m; sourceTree = "<group>"; };
@@ -79,7 +77,6 @@
 				8F534CDE1642FEB8001D00EB /* UIKit.framework in Frameworks */,
 				747FD7F519D1D56F003C512A /* libRedLaserSDK_arm64.a in Frameworks */,
 				AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */,
-				8F534CD316420747001D00EB /* libRedLaserSDK.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -145,7 +142,6 @@
 			isa = PBXGroup;
 			children = (
 				747FD7F419D1D56F003C512A /* libRedLaserSDK_arm64.a */,
-				8F534CD116420747001D00EB /* libRedLaserSDK.a */,
 				8F534CD216420747001D00EB /* RedLaserSDK.h */,
 			);
 			path = RedLaserLib;

diff --git a/ios/ti.redlaser-iphone-1.2.0.zip b/ios/ti.redlaser-iphone-1.2.0.zip