OS X fixes

diff --git a/Makefile b/Makefile
index 54c52abc81bb789299e9ef10997a1f2305883530..a5f6f55ac057173bbc3d67a64ec60186f05f0e5b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 
 OFILES=png.o usbtmc.o commands.o
 
 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
 CC=gcc
 
 all: rigol rigold raw2gp

diff --git a/commands.c b/commands.c
index 83df9c46ae811a835dcb874558ca46fb0a716c69..f3dc86c48f9ff760ef65b465c7137bafa537efbf 100644 (file)
--- 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)) {
        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);
        }
 
        png = lcd2png(screen, imglen);