huangbo преди 9 години
родител
ревизия
0f85425c0d
променени са 2 файла, в които са добавени 10 реда и са изтрити 6 реда
  1. 6 2
      DisplayClient/DisplayClient.xcodeproj/project.pbxproj
  2. 4 4
      WadeMobileFunc/WadeMobileFunc.xcodeproj/project.pbxproj

+ 6 - 2
DisplayClient/DisplayClient.xcodeproj/project.pbxproj

@ -36,6 +36,7 @@
36 36
		54D887FC19F4ED09003C4B3C /* Res in Resources */ = {isa = PBXBuildFile; fileRef = 54D887FB19F4ED09003C4B3C /* Res */; };
37 37
		E22600B81B6E4719002BF436 /* DCLocalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E22600B71B6E4719002BF436 /* DCLocalViewController.m */; };
38 38
		E22600BB1B6E47B0002BF436 /* DCRemoteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E22600BA1B6E47B0002BF436 /* DCRemoteViewController.m */; };
39
		E2D121831C75BCF00086E9C2 /* zbarSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E2D121821C75BCF00086E9C2 /* zbarSDK.a */; };
39 40
		E2EE4A971C06ED75007E420B /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2EE4A961C06ED75007E420B /* libiconv.dylib */; };
40 41
		E2EE4AA11C06ED88007E420B /* IpuLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2EE4A991C06ED88007E420B /* IpuLib.framework */; };
41 42
		E2EE4AA21C06ED88007E420B /* IpuLib.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E2EE4A991C06ED88007E420B /* IpuLib.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@ -119,6 +120,7 @@
119 120
		E22600B91B6E47B0002BF436 /* DCRemoteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCRemoteViewController.h; sourceTree = "<group>"; };
120 121
		E22600BA1B6E47B0002BF436 /* DCRemoteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DCRemoteViewController.m; sourceTree = "<group>"; };
121 122
		E27EA50A1B88675300958662 /* DCLuaTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DCLuaTest.m; sourceTree = "<group>"; };
123
		E2D121821C75BCF00086E9C2 /* zbarSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = zbarSDK.a; sourceTree = "<group>"; };
122 124
		E2EE4A961C06ED75007E420B /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
123 125
		E2EE4A981C06ED88007E420B /* AMap.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = AMap.bundle; path = ../../IpuCommon/Frameworks/AMap.bundle; sourceTree = "<group>"; };
124 126
		E2EE4A991C06ED88007E420B /* IpuLib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IpuLib.framework; path = ../../IpuCommon/Frameworks/IpuLib.framework; sourceTree = "<group>"; };
@ -143,6 +145,7 @@
143 145
				E2EE4AA11C06ED88007E420B /* IpuLib.framework in Frameworks */,
144 146
				E2EE4AA51C06ED88007E420B /* WadeMobile.framework in Frameworks */,
145 147
				E2EE4AA71C06ED88007E420B /* WadeMobileFunc.framework in Frameworks */,
148
				E2D121831C75BCF00086E9C2 /* zbarSDK.a in Frameworks */,
146 149
				E2EE4A971C06ED75007E420B /* libiconv.dylib in Frameworks */,
147 150
			);
148 151
			runOnlyForDeploymentPostprocessing = 0;
@ -162,6 +165,7 @@
162 165
		544D1A361A6CEBFC00CEE164 /* ZBarSDK */ = {
163 166
			isa = PBXGroup;
164 167
			children = (
168
				E2D121821C75BCF00086E9C2 /* zbarSDK.a */,
165 169
				544D1A371A6CEBFD00CEE164 /* Headers */,
166 170
				544D1A4F1A6CEBFD00CEE164 /* Resources */,
167 171
			);
@ -590,7 +594,7 @@
590 594
				PROVISIONING_PROFILE = "";
591 595
				SKIP_INSTALL = NO;
592 596
				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
593
				VALID_ARCHS = "armv7 armv7s";
597
				VALID_ARCHS = "arm64 armv7 armv7s i386";
594 598
				WRAPPER_EXTENSION = app;
595 599
			};
596 600
			name = Debug;
@ -627,7 +631,7 @@
627 631
				PROVISIONING_PROFILE = "";
628 632
				SKIP_INSTALL = NO;
629 633
				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
630
				VALID_ARCHS = "armv7 armv7s";
634
				VALID_ARCHS = "arm64 armv7 armv7s i386";
631 635
				WRAPPER_EXTENSION = app;
632 636
			};
633 637
			name = Release;

+ 4 - 4
WadeMobileFunc/WadeMobileFunc.xcodeproj/project.pbxproj

@ -26,10 +26,10 @@
26 26
		0A9CD0F61BA8597400615D81 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A9CD0F51BA8597400615D81 /* SystemConfiguration.framework */; };
27 27
		0AA07C021BB006E200FA657B /* WDFMobilePush.h in Headers */ = {isa = PBXBuildFile; fileRef = 0AA07C001BB006E200FA657B /* WDFMobilePush.h */; };
28 28
		0AA07C031BB006E200FA657B /* WDFMobilePush.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AA07C011BB006E200FA657B /* WDFMobilePush.m */; };
29
		E214A02C1BF22D4500B33B7D /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A96AB051B9FD8A8003CACA5 /* libsqlite3.dylib */; };
30 29
		E284362D1C62EA300020641D /* WadeMobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2BECE1E1BF8F0390077807A /* WadeMobile.framework */; };
31 30
		E284362E1C62EA450020641D /* IpuLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2BECE1C1BF8F0390077807A /* IpuLib.framework */; };
32 31
		E28436301C62EA450020641D /* WadeMobileUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2BECE201BF8F0390077807A /* WadeMobileUI.framework */; };
32
		E2D121851C75BEF40086E9C2 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2D121841C75BEF40086E9C2 /* libsqlite3.dylib */; };
33 33
		E2DE1B051B42DE6A00762141 /* WDFMobileApp.h in Headers */ = {isa = PBXBuildFile; fileRef = E2DE1AF31B42DE6A00762141 /* WDFMobileApp.h */; settings = {ATTRIBUTES = (Public, ); }; };
34 34
		E2DE1B061B42DE6A00762141 /* WDFMobileApp.m in Sources */ = {isa = PBXBuildFile; fileRef = E2DE1AF41B42DE6A00762141 /* WDFMobileApp.m */; };
35 35
		E2DE1B071B42DE6A00762141 /* WDFMobileAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = E2DE1AF51B42DE6A00762141 /* WDFMobileAudio.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -68,7 +68,6 @@
68 68
/* Begin PBXFileReference section */
69 69
		0A96AAFD1B9FCCE8003CACA5 /* WDFMobileDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WDFMobileDatabase.h; sourceTree = "<group>"; };
70 70
		0A96AAFE1B9FCCE8003CACA5 /* WDFMobileDatabase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WDFMobileDatabase.m; sourceTree = "<group>"; };
71
		0A96AB051B9FD8A8003CACA5 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
72 71
		0A9CD0F51BA8597400615D81 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
73 72
		0AA07C001BB006E200FA657B /* WDFMobilePush.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WDFMobilePush.h; sourceTree = "<group>"; };
74 73
		0AA07C011BB006E200FA657B /* WDFMobilePush.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WDFMobilePush.m; sourceTree = "<group>"; };
@ -77,6 +76,7 @@
77 76
		E2BECE1E1BF8F0390077807A /* WadeMobile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WadeMobile.framework; path = ../IpuCommon/Frameworks/WadeMobile.framework; sourceTree = "<group>"; };
78 77
		E2BECE1F1BF8F0390077807A /* WadeMobileFunc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WadeMobileFunc.framework; path = ../IpuCommon/Frameworks/WadeMobileFunc.framework; sourceTree = "<group>"; };
79 78
		E2BECE201BF8F0390077807A /* WadeMobileUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WadeMobileUI.framework; path = ../IpuCommon/Frameworks/WadeMobileUI.framework; sourceTree = "<group>"; };
79
		E2D121841C75BEF40086E9C2 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = ../../../../../../usr/lib/libsqlite3.dylib; sourceTree = "<group>"; };
80 80
		E2DE1AD41B42DD9500762141 /* WadeMobileFunc.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WadeMobileFunc.framework; sourceTree = BUILT_PRODUCTS_DIR; };
81 81
		E2DE1AD81B42DD9500762141 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
82 82
		E2DE1AE51B42DD9500762141 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@ -121,10 +121,10 @@
121 121
			isa = PBXFrameworksBuildPhase;
122 122
			buildActionMask = 2147483647;
123 123
			files = (
124
				E2D121851C75BEF40086E9C2 /* libsqlite3.dylib in Frameworks */,
124 125
				E284362E1C62EA450020641D /* IpuLib.framework in Frameworks */,
125 126
				E28436301C62EA450020641D /* WadeMobileUI.framework in Frameworks */,
126 127
				E284362D1C62EA300020641D /* WadeMobile.framework in Frameworks */,
127
				E214A02C1BF22D4500B33B7D /* libsqlite3.dylib in Frameworks */,
128 128
				0A9CD0F61BA8597400615D81 /* SystemConfiguration.framework in Frameworks */,
129 129
				E2DE1B281B42DF3B00762141 /* AVFoundation.framework in Frameworks */,
130 130
				E2DE1B261B42DF3100762141 /* AudioToolbox.framework in Frameworks */,
@ -218,12 +218,12 @@
218 218
		E2DE1B2D1B42DFA800762141 /* Frameworks */ = {
219 219
			isa = PBXGroup;
220 220
			children = (
221
				E2D121841C75BEF40086E9C2 /* libsqlite3.dylib */,
221 222
				E28436311C62EA450020641D /* IpuMap.framework */,
222 223
				E2BECE1C1BF8F0390077807A /* IpuLib.framework */,
223 224
				E2BECE1E1BF8F0390077807A /* WadeMobile.framework */,
224 225
				E2BECE1F1BF8F0390077807A /* WadeMobileFunc.framework */,
225 226
				E2BECE201BF8F0390077807A /* WadeMobileUI.framework */,
226
				0A96AB051B9FD8A8003CACA5 /* libsqlite3.dylib */,
227 227
				0A9CD0F51BA8597400615D81 /* SystemConfiguration.framework */,
228 228
				E2DE1B271B42DF3B00762141 /* AVFoundation.framework */,
229 229
				E2DE1B251B42DF3100762141 /* AudioToolbox.framework */,