Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updating touch code to 4.0 compatible

  • Loading branch information...
commit 1e55fa35a83c2f35d133ecc911c96622be3c5ccb 1 parent ddaa70a
Marcus S. Zarra authored
View
12 .gitignore
@@ -1,14 +1,20 @@
build
*xcodeproj/*mode*
*xcodeproj/*pbxuser
-*xcodeproj/*perspective*
+*xcodeproj/*per*
+*xcodeproj/project.xcworkspace
+*xcodeproj/xcuserdata
**/build
**/*xcodeproj/*mode*
**/*xcodeproj/*pbxuser
-**/*xcodeproj/*perspective*
+**/*xcodeproj/*per*
+**/*xcodeproj/project.xcworkspace
+**/*xcodeproj/xcuserdata
**/**/*xcodeproj/*mode*
**/**/*xcodeproj/*pbxuser
-**/**/*xcodeproj/*perspective*
+**/**/*xcodeproj/*per*
+**/**/*xcodeproj/project.xcworkspace
+**/**/*xcodeproj/xcuserdata
*tmproj
**/~*
.DS_Store
View
1  DesktopCode/PairingCodeWindowController.m
@@ -57,7 +57,6 @@ - (void)windowDidBecomeKey:(NSNotification*)notification
- (void) dealloc
{
DLog(@"window released cleanly");
- [codeString release], codeString = nil;
[super dealloc];
}
View
1  DesktopCode/ZSyncHandler.m
@@ -85,6 +85,7 @@ - (void)stopBroadcasting;
- (void)listener:(TCPListener*)listener didAcceptConnection:(BLIPConnection*)connection
{
+ DLog(@"fired");
ZSyncConnectionDelegate *delegate = [[ZSyncConnectionDelegate alloc] init];
[delegate setConnection:connection];
[connection setDelegate:delegate];
View
BIN  DeviceCode/libMYNetwork.a
Binary file not shown
View
16 SampleTouch/SampleTouch.xcodeproj/project.pbxproj
@@ -21,6 +21,7 @@
B61384D110BCD3D9006E7227 /* PairingServerTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B61384D010BCD3D9006E7227 /* PairingServerTableViewController.m */; };
B61384FB10BCD82C006E7227 /* app.png in Resources */ = {isa = PBXBuildFile; fileRef = B61384FA10BCD82C006E7227 /* app.png */; };
B631391C10AB4E9900E27635 /* ZSyncTouchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = B631391B10AB4E9900E27635 /* ZSyncTouchHandler.m */; };
+ B640DC6911C9EF18007880F4 /* libMYNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B640DC6811C9EF18007880F4 /* libMYNetwork.a */; };
B642864010BEA11700470E43 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B642863F10BEA11700470E43 /* QuartzCore.framework */; };
B64FE94710EF35EF00B15A8F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B64FE94610EF35EF00B15A8F /* libz.dylib */; };
B69CD13D10EA9EC4006C50C9 /* DataModel.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = B69CD13C10EA9EC4006C50C9 /* DataModel.xcdatamodel */; };
@@ -28,7 +29,6 @@
B6C2E13710A748B50063E436 /* RootViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6C2E13310A748B50063E436 /* RootViewController.xib */; };
B6DA32B410ED55C3008724A6 /* ChildViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6DA32B310ED55C3008724A6 /* ChildViewController.m */; };
B6EC175810F503360051FD2E /* GTMNSData+zlib.m in Sources */ = {isa = PBXBuildFile; fileRef = B6EC175710F503360051FD2E /* GTMNSData+zlib.m */; };
- B6EC179B10F508C10051FD2E /* libMYNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B6EC179A10F508C10051FD2E /* libMYNetwork.a */; };
B6FF2CDE10B5106D007AB6D4 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6FF2CDD10B5106D007AB6D4 /* CFNetwork.framework */; };
/* End PBXBuildFile section */
@@ -57,6 +57,7 @@
B631391910AB4E7F00E27635 /* ZSyncTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZSyncTouch.h; sourceTree = "<group>"; };
B631391A10AB4E9900E27635 /* ZSyncTouchHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZSyncTouchHandler.h; sourceTree = "<group>"; };
B631391B10AB4E9900E27635 /* ZSyncTouchHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZSyncTouchHandler.m; sourceTree = "<group>"; };
+ B640DC6811C9EF18007880F4 /* libMYNetwork.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMYNetwork.a; path = ../DeviceCode/libMYNetwork.a; sourceTree = SOURCE_ROOT; };
B642863F10BEA11700470E43 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
B6457FED10B0A94E00A96714 /* ZSyncShared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZSyncShared.h; sourceTree = "<group>"; };
B64FE94610EF35EF00B15A8F /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
@@ -68,7 +69,6 @@
B6EC175510F503360051FD2E /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMDefines.h; sourceTree = "<group>"; };
B6EC175610F503360051FD2E /* GTMNSData+zlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSData+zlib.h"; sourceTree = "<group>"; };
B6EC175710F503360051FD2E /* GTMNSData+zlib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSData+zlib.m"; sourceTree = "<group>"; };
- B6EC179A10F508C10051FD2E /* libMYNetwork.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMYNetwork.a; sourceTree = "<group>"; };
B6FF2CDD10B5106D007AB6D4 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
@@ -84,8 +84,8 @@
B6FF2CDE10B5106D007AB6D4 /* CFNetwork.framework in Frameworks */,
B642864010BEA11700470E43 /* QuartzCore.framework in Frameworks */,
B64FE94710EF35EF00B15A8F /* libz.dylib in Frameworks */,
- B6EC179B10F508C10051FD2E /* libMYNetwork.a in Frameworks */,
B60BDD8B116DA124006ABE03 /* SystemConfiguration.framework in Frameworks */,
+ B640DC6911C9EF18007880F4 /* libMYNetwork.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -172,7 +172,6 @@
B631391810AB4E5700E27635 /* DeviceCode */ = {
isa = PBXGroup;
children = (
- B6EC179A10F508C10051FD2E /* libMYNetwork.a */,
B631391910AB4E7F00E27635 /* ZSyncTouch.h */,
B631391A10AB4E9900E27635 /* ZSyncTouchHandler.h */,
B631391B10AB4E9900E27635 /* ZSyncTouchHandler.m */,
@@ -186,6 +185,7 @@
B6457FEB10B0A93D00A96714 /* SharedCode */ = {
isa = PBXGroup;
children = (
+ B640DC6811C9EF18007880F4 /* libMYNetwork.a */,
B6457FED10B0A94E00A96714 /* ZSyncShared.h */,
);
name = SharedCode;
@@ -363,10 +363,12 @@
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 3.1;
PREBINDING = NO;
- SDKROOT = iphoneos3.1;
+ SDKROOT = iphoneos4.0;
};
name = Debug;
};
@@ -376,10 +378,12 @@
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 3.1;
PREBINDING = NO;
- SDKROOT = iphoneos3.1;
+ SDKROOT = iphoneos4.0;
};
name = Release;
};
Please sign in to comment.
Something went wrong with that request. Please try again.