diff options
Diffstat (limited to 'commandline')
-rw-r--r-- | commandline/Makefile | 10 | ||||
-rwxr-xr-x | commandline/builds/OSX/micronucleus | bin | 0 -> 124292 bytes | |||
-rwxr-xr-x | commandline/builds/Windows/micronucleus.exe | bin | 26126 -> 0 bytes | |||
-rw-r--r-- | commandline/library/micronucleus_lib.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/commandline/Makefile b/commandline/Makefile index 5d7a410..3c52cb4 100644 --- a/commandline/Makefile +++ b/commandline/Makefile @@ -3,7 +3,6 @@ CC=gcc -# FIXME: Need to add OSX stuff ifeq ($(shell uname), Linux) USBFLAGS=$(shell libusb-config --cflags) USBLIBS=$(shell libusb-config --libs) @@ -14,6 +13,13 @@ else ifeq ($(shell uname), Darwin) USBLIBS=$(shell libusb-config --libs || libusb-legacy-config --libs) EXE_SUFFIX = OSFLAG = -D MAC_OS + # Uncomment these to create a static binary: + # USBLIBS = /opt/local/lib/libusb-legacy/libusb-legacy.a + # USBLIBS += -mmacosx-version-min=10.5 + # USBLIBS += -framework CoreFoundation + # USBLIBS += -framework IOKit + # Uncomment these to create a dual architecture binary: + # OSFLAG += -arch x86_64 -arch i386 else USBFLAGS = -I C:\MinGW\include USBLIBS = -L C:\MinGW\lib -lusb @@ -41,7 +47,7 @@ $(LWLIBS): $(EXAMPLES): $(addsuffix .o, $(LWLIBS)) @echo Building command line tool: $@... $(CC) $(CFLAGS) -o $@$(EXE_SUFFIX) $@.c $^ $(LIBS) - + clean: rm -f $(EXAMPLES)$(EXE_SUFFIX) *.o *.exe diff --git a/commandline/builds/OSX/micronucleus b/commandline/builds/OSX/micronucleus Binary files differnew file mode 100755 index 0000000..3ae62c4 --- /dev/null +++ b/commandline/builds/OSX/micronucleus diff --git a/commandline/builds/Windows/micronucleus.exe b/commandline/builds/Windows/micronucleus.exe Binary files differdeleted file mode 100755 index 4d5e212..0000000 --- a/commandline/builds/Windows/micronucleus.exe +++ /dev/null diff --git a/commandline/library/micronucleus_lib.c b/commandline/library/micronucleus_lib.c index dd10d25..76594d8 100644 --- a/commandline/library/micronucleus_lib.c +++ b/commandline/library/micronucleus_lib.c @@ -207,7 +207,7 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_siz USB_ENDPOINT_OUT| USB_TYPE_VENDOR | USB_RECIP_DEVICE, 1, page_length, address, - page_buffer, page_length, + (char*)page_buffer, page_length, MICRONUCLEUS_USB_TIMEOUT); if (res != page_length) return -1; |