Browse Source

Install cli binaries to /usr/local/bin

Thomas Buck 8 years ago
parent
commit
9286a1da0f

+ 5
- 5
Makefile View File

@@ -13,13 +13,13 @@ all: bin/protocol bin/foohid build/Release/SerialGamepad.app build/Installer.pkg
13 13
 	cp -R build/Installer.pkg bin/SerialGamepad.pkg
14 14
 
15 15
 # Install locally
16
-install: all
17
-	cp bin/protocol ~/bin/protocol
18
-	cp bin/foohid ~/bin/foohid
16
+install: bin/protocol bin/foohid build/Release/SerialGamepad.app
17
+	cp bin/protocol /usr/local/bin/serial-protocol
18
+	cp bin/foohid /usr/local/bin/foohid
19 19
 	cp -r build/Release/SerialGamepad.app /Applications/SerialGamepad.app
20 20
 
21 21
 # Build GUI project
22
-build/Release/SerialGamepad.app:
22
+build/Release/SerialGamepad.app: SerialGamepad SerialGamepad.xcodeproj
23 23
 	xcodebuild
24 24
 
25 25
 # Build protocol binary
@@ -47,7 +47,7 @@ build/SerialGamepad.pkg: build/Release/SerialGamepad.app
47 47
 		build/SerialGamepad.pkg
48 48
 
49 49
 # Create installer bundling our App and fooHID
50
-build/Installer.pkg: build/SerialGamepad.pkg build/foohid.pkg Resources/Distribution.xml Resources/readme.rtf Resources/license.txt
50
+build/Installer.pkg: build/SerialGamepad.pkg build/foohid.pkg Resources
51 51
 	productbuild \
52 52
 		--distribution Resources/Distribution.xml \
53 53
 		--package-path build \

BIN
SerialGamepad.xcodeproj/project.xcworkspace/xcuserdata/thomas.xcuserdatad/UserInterfaceState.xcuserstate View File


+ 1
- 1
SerialGamepad/Info.plist View File

@@ -21,7 +21,7 @@
21 21
 	<key>CFBundleSignature</key>
22 22
 	<string>????</string>
23 23
 	<key>CFBundleVersion</key>
24
-	<string>88</string>
24
+	<string>89</string>
25 25
 	<key>LSApplicationCategoryType</key>
26 26
 	<string>public.app-category.utilities</string>
27 27
 	<key>LSMinimumSystemVersion</key>

+ 3
- 1
SerialGamepad/Thread.m View File

@@ -140,7 +140,9 @@ enum ThreadState {
140 140
                     }
141 141
                     
142 142
                     if (channels[CHANNELS] != channels[TESTCHANNEL]) {
143
-                        NSLog(@"Wrong test channel value: %d != %d\n", channels[CHANNELS], channels[TESTCHANNEL]);
143
+                        // This channel contains the throttle value even if it has been disabled using the switches
144
+                        // on the transmitter. Therefore, there's not really a warning required here.
145
+                        //NSLog(@"Wrong test channel value: %d != %d\n", channels[CHANNELS], channels[TESTCHANNEL]);
144 146
                     }
145 147
                     
146 148
                     NSMutableArray *arr = [[NSMutableArray alloc] initWithCapacity:CHANNELS];

Loading…
Cancel
Save