made it 64bit

13 files changed, 46 insertions, 54 deletions

diff --git a/DDHidLib.xcodeproj/project.pbxproj b/DDHidLib.xcodeproj/project.pbxproj
index e7201f6..325916b 100644
--- a/DDHidLib.xcodeproj/project.pbxproj
+++ b/DDHidLib.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 42;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -616,8 +616,11 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0460;
+			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DDHidLib" */;
-			compatibilityVersion = "Xcode 2.4";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -815,6 +818,7 @@
 		551711290B8F420E00C82155 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -826,8 +830,8 @@
 		5517112A0B8F420E00C82155 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				PRODUCT_NAME = All;
 				ZERO_LINK = NO;
@@ -837,12 +841,12 @@
 		55193E540B93F2EF004C0C98 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -856,7 +860,6 @@
 					"-framework",
 					AppKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = DDHidLib;
 				ZERO_LINK = NO;
 			};
@@ -865,11 +868,11 @@
 		55193E550B93F2EF004C0C98 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -882,7 +885,6 @@
 					"-framework",
 					AppKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = DDHidLib;
 				ZERO_LINK = NO;
 			};
@@ -892,11 +894,10 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 55D592200BAE2E4500364849 /* versions.xcconfig */;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
@@ -909,10 +910,8 @@
 					"-framework",
 					AppKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = HIDDeviceTest;
 				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
 			};
 			name = Debug;
 		};
@@ -920,10 +919,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 55D592200BAE2E4500364849 /* versions.xcconfig */;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
 				INFOPLIST_FILE = device_test/Info.plist;
@@ -935,19 +933,17 @@
 					"-framework",
 					AppKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = HIDDeviceTest;
 				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
 		559CBBE70B5B338B00C8FD74 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -960,7 +956,6 @@
 					"-framework",
 					AppKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = ddhid;
 				ZERO_LINK = NO;
 			};
@@ -969,8 +964,8 @@
 		559CBBE80B5B338B00C8FD74 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -982,7 +977,6 @@
 					"-framework",
 					AppKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = ddhid;
 				ZERO_LINK = NO;
 			};
@@ -992,9 +986,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 55D592200BAE2E4500364849 /* versions.xcconfig */;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = browser/Info.plist;
@@ -1010,6 +1004,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 55D592200BAE2E4500364849 /* versions.xcconfig */;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G5;
 				INFOPLIST_FILE = browser/Info.plist;
@@ -1025,13 +1020,13 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 55D592200BAE2E4500364849 /* versions.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				CLANG_ENABLE_OBJC_ARC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				PREBINDING = NO;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				SDKROOT = macosx;
-				VALID_ARCHS = i386;
 			};
 			name = Debug;
 		};
@@ -1039,17 +1034,13 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 55D592200BAE2E4500364849 /* versions.xcconfig */;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_ENABLE_OBJC_ARC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				PREBINDING = NO;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				SDKROOT = macosx;
-				VALID_ARCHS = i386;
 			};
 			name = Release;
 		};
diff --git a/README.md b/README.md
index 5c44eb5..5e034a1 100644
--- a/README.md
+++ b/README.md
@@ -7,4 +7,5 @@ An Objective-C wrapper around IOHIDLib.
 http://www.dribin.org/dave/software/
 
 ###Modifications in the repo:
-added experimental support for apple mics with built-in keys.
\ No newline at end of file
+- added experimental support for (apple) mics with built-in keys.
+- dropped ppc and added x64 support
\ No newline at end of file
diff --git a/device_test/AppleMikeyPaneController.h b/device_test/AppleMikeyPaneController.h
index e02ec41..d72059e 100644
--- a/device_test/AppleMikeyPaneController.h
+++ b/device_test/AppleMikeyPaneController.h
@@ -33,7 +33,7 @@
     IBOutlet NSArrayController * mMikeysEventsController;
 
     NSArray * mMikeys;
-    unsigned mMikeyIndex;
+    NSUInteger mMikeyIndex;
     NSMutableArray * mEvents;
     
     // Don't retain these
@@ -43,8 +43,8 @@
 - (NSArray *) mikeys;
 - (void) setMikeys: (NSArray *) theMikeys;
 
-- (unsigned) mikeyIndex;
-- (void) setMikeyIndex: (unsigned) theMikeyIndex;
+- (NSUInteger) mikeyIndex;
+- (void) setMikeyIndex: (NSUInteger) theMikeyIndex;
 
 - (NSMutableArray *) events;
 - (void) setEvents: (NSMutableArray *) theEvents;
diff --git a/device_test/AppleMikeyPaneController.m b/device_test/AppleMikeyPaneController.m
index ba0764e..db0ac18 100644
--- a/device_test/AppleMikeyPaneController.m
+++ b/device_test/AppleMikeyPaneController.m
@@ -85,12 +85,12 @@
 //=========================================================== 
 //  mikeyIndex
 //=========================================================== 
-- (unsigned) mikeyIndex
+- (NSUInteger) mikeyIndex
 {
     return mMikeyIndex;
 }
 
-- (void) setMikeyIndex: (unsigned) theMikeyIndex
+- (void) setMikeyIndex: (NSUInteger) theMikeyIndex
 {
     if (mCurrentMikey != nil)
     {
diff --git a/device_test/JoystickPaneController.h b/device_test/JoystickPaneController.h
index 38015d0..8126ffb 100644
--- a/device_test/JoystickPaneController.h
+++ b/device_test/JoystickPaneController.h
@@ -34,7 +34,7 @@
     NSMutableArray * mJoystickButtons;
     int mXAxis;
     int mYAxis;
-    unsigned mJoystickIndex;
+    NSUInteger mJoystickIndex;
 
     // Don't retain these
     DDHidJoystick * mCurrentJoystick;
@@ -44,8 +44,8 @@
 
 - (NSArray *) joystickButtons;
 
-- (unsigned) joystickIndex;
-- (void) setJoystickIndex: (unsigned) theJoystickIndex;
+- (NSUInteger) joystickIndex;
+- (void) setJoystickIndex: (NSUInteger) theJoystickIndex;
 
 - (int) xAxis;
 - (int) yAxis;
diff --git a/device_test/JoystickPaneController.m b/device_test/JoystickPaneController.m
index 52dd949..12beff8 100644
--- a/device_test/JoystickPaneController.m
+++ b/device_test/JoystickPaneController.m
@@ -64,12 +64,12 @@
 //=========================================================== 
 //  joystickIndex 
 //=========================================================== 
-- (unsigned) joystickIndex
+- (NSUInteger) joystickIndex
 {
     return mJoystickIndex;
 }
 
-- (void) setJoystickIndex: (unsigned) theJoystickIndex
+- (void) setJoystickIndex: (NSUInteger) theJoystickIndex
 {
     if (mCurrentJoystick != nil)
     {
diff --git a/device_test/KeyboardPaneController.h b/device_test/KeyboardPaneController.h
index b42db30..f134d2d 100644
--- a/device_test/KeyboardPaneController.h
+++ b/device_test/KeyboardPaneController.h
@@ -33,7 +33,7 @@
     IBOutlet NSArrayController * mKeyboardEventsController;
 
     NSArray * mKeyboards;
-    unsigned mKeyboardIndex;
+    NSUInteger mKeyboardIndex;
     NSMutableArray * mEvents;
     
     // Don't retain these
@@ -43,8 +43,8 @@
 - (NSArray *) keyboards;
 - (void) setKeyboards: (NSArray *) theKeyboards;
 
-- (unsigned) keyboardIndex;
-- (void) setKeyboardIndex: (unsigned) theKeyboardIndex;
+- (NSUInteger) keyboardIndex;
+- (void) setKeyboardIndex: (NSUInteger) theKeyboardIndex;
 
 - (NSMutableArray *) events;
 - (void) setEvents: (NSMutableArray *) theEvents;
diff --git a/device_test/KeyboardPaneController.m b/device_test/KeyboardPaneController.m
index 0472718..160577f 100644
--- a/device_test/KeyboardPaneController.m
+++ b/device_test/KeyboardPaneController.m
@@ -91,12 +91,12 @@
 //=========================================================== 
 //  keyboardIndex 
 //=========================================================== 
-- (unsigned) keyboardIndex
+- (NSUInteger) keyboardIndex
 {
     return mKeyboardIndex;
 }
 
-- (void) setKeyboardIndex: (unsigned) theKeyboardIndex
+- (void) setKeyboardIndex: (NSUInteger) theKeyboardIndex
 {
     if (mCurrentKeyboard != nil)
     {
diff --git a/device_test/MousePaneController.h b/device_test/MousePaneController.h
index 031aae1..40d3c09 100644
--- a/device_test/MousePaneController.h
+++ b/device_test/MousePaneController.h
@@ -33,7 +33,7 @@
     NSArray * mMice;
     DDHidMouse * mCurrentMouse;
     
-    unsigned mMouseIndex;
+    NSUInteger mMouseIndex;
     int mMouseX;
     int mMouseY;
     int mMouseWheel;
@@ -47,8 +47,8 @@
 
 - (NSArray *) mouseButtons;
 
-- (unsigned) mouseIndex;
-- (void) setMouseIndex: (unsigned) theMouseIndex;
+- (NSUInteger) mouseIndex;
+- (void) setMouseIndex: (NSUInteger) theMouseIndex;
 
 - (int) maxValue;
 
diff --git a/device_test/MousePaneController.m b/device_test/MousePaneController.m
index 74f1590..27ad49b 100644
--- a/device_test/MousePaneController.m
+++ b/device_test/MousePaneController.m
@@ -89,7 +89,7 @@ static int applyDelta(int current, int delta)
 //=========================================================== 
 // - mouseIndex
 //=========================================================== 
-- (unsigned) mouseIndex
+- (NSUInteger) mouseIndex
 {
     return mMouseIndex;
 }
@@ -97,7 +97,7 @@ static int applyDelta(int current, int delta)
 //=========================================================== 
 // - setMouseIndex:
 //=========================================================== 
-- (void) setMouseIndex: (unsigned) theMouseIndex
+- (void) setMouseIndex: (NSUInteger) theMouseIndex
 {
     if (mCurrentMouse != nil)
     {
diff --git a/lib/DDHidKeyboardBarcodeScanner.h b/lib/DDHidKeyboardBarcodeScanner.h
index 8504343..6573b01 100644
--- a/lib/DDHidKeyboardBarcodeScanner.h
+++ b/lib/DDHidKeyboardBarcodeScanner.h
@@ -48,7 +48,7 @@
 
 - (NSArray *) keyElements;
 
-- (unsigned) numberOfKeys;
+- (NSUInteger) numberOfKeys;
 
 - (void) addElementsToQueue: (DDHidQueue *) queue;
 
diff --git a/lib/DDHidKeyboardBarcodeScanner.m b/lib/DDHidKeyboardBarcodeScanner.m
index 8705cf3..a6c434f 100644
--- a/lib/DDHidKeyboardBarcodeScanner.m
+++ b/lib/DDHidKeyboardBarcodeScanner.m
@@ -98,7 +98,7 @@
     return mKeyElements;
 }
 
-- (unsigned) numberOfKeys;
+- (NSUInteger) numberOfKeys;
 {
     return [mKeyElements count];
 }
diff --git a/versions.xcconfig b/versions.xcconfig
index b0e1427..1a5dc2f 100644
--- a/versions.xcconfig
+++ b/versions.xcconfig
@@ -1,2 +1,2 @@
-CURRENT_MARKETING_VERSION = 1.1
+CURRENT_MARKETING_VERSION = 1.1.1
 CURRENT_PROJECT_VERSION = 1010.9.0