浏览代码

Added Mac OSX support for the bootloaderhost utility (not tested)

Michael McMaster 12 年之前
父节点
当前提交
eb0b2b2ca3
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. 3 1
      lib/SCSI2SD/software/bootloaderhost/Makefile
  2. 2 2
      lib/SCSI2SD/software/bootloaderhost/main.c

+ 3 - 1
lib/SCSI2SD/software/bootloaderhost/Makefile

@@ -6,6 +6,7 @@ CYAPI = \
 	cybootloaderutils/cybtldr_command.c \
 	cybootloaderutils/cybtldr_parse.c \
 
+CFLAGS += -Wall -Wno-pointer-sign
 
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -15,11 +16,12 @@ endif
 ifeq ($(UNAME_S),Darwin)
 	# Should match OSX
 	HID_C = hidapi/mac/hid.c
+	LDFLAGS += -framework IOKit -framework CoreFoundation
 endif
 
 
 bootloaderhost: main.c $(HID_C) $(CYAPI)
-	$(CC) $(CFLAGS) -g -I cybootloaderutils -I hidapi/hidapi $^ $(LDFLAGS) -o $@
+	$(CC) $(CFLAGS) -I cybootloaderutils -I hidapi/hidapi $^ $(LDFLAGS) -o $@
 
 clean:
 	rm bootloaderhost

+ 2 - 2
lib/SCSI2SD/software/bootloaderhost/main.c

@@ -110,10 +110,10 @@ int main(int argc, char* argv[])
 		switch (c)
 		{
 		case 'v':
-			sscanf(optarg, "%x", &vendorId);
+			sscanf(optarg, "%hx", &vendorId);
 			break;
 		case 'p':
-			sscanf(optarg, "%x", &productId);
+			sscanf(optarg, "%hx", &productId);
 			break;
 		case '?':
 			usage();