From: Michael Gernoth <michael@gernoth.net>
Date: Sun, 6 Jun 2010 17:51:52 +0000 (+0200)
Subject: OS X fixes
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/rigol/commitdiff_plain/5ef9b719d9b1c393cfbbc535d31c0da048f1c04d?ds=inline

OS X fixes
---

diff --git a/Makefile b/Makefile
index 54c52ab..a5f6f55 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 
 OFILES=png.o usbtmc.o commands.o
-CFLAGS=-O2 -Wall
-LDFLAGS=-lusb -lreadline -lz
+CFLAGS=-O2 -Wall -I/opt/local/include
+LDFLAGS=-L/opt/local/lib -lusb -lreadline -lz
 CC=gcc
 
 all: rigol rigold raw2gp
diff --git a/commands.c b/commands.c
index 83df9c4..f3dc86c 100644
--- a/commands.c
+++ b/commands.c
@@ -121,7 +121,7 @@ unsigned char* get_lcd(struct usb_dev_handle *sc, int *imglen, int keylock)
 	l = usbtmc_sendscpi(sc, ":LCD:DATA?", screen, sizeof(screen));
 
 	if (l != sizeof(screen)) {
-		printf ("hmm. didnt' get %d bytes, but %d\n\n", sizeof(screen), l); 
+		printf ("hmm. didnt' get %d bytes, but %d\n\n", (int)sizeof(screen), l); 
 	}
 
 	png = lcd2png(screen, imglen);