jackcartersmith/xilinx-usb-driver
Archived
1
0
Fork 0
Code Releases Activity

work correclty on 64bit systems with 32bit userland

Browse Source
This commit is contained in:
Michael Gernoth 2007-05-26 23:19:25 +02:00
parent 7517e9fe05
commit d59d5fb4e8
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -2,10 +2,7 @@
#a Parallel Cable III #a Parallel Cable III
CFLAGS=-Wall -fPIC -DUSB_DRIVER_VERSION="\"$(shell stat -c '%y' usb-driver.c |cut -d\. -f1)\"" #-DFORCE_PC3_IDENT CFLAGS=-Wall -fPIC -DUSB_DRIVER_VERSION="\"$(shell stat -c '%y' usb-driver.c |cut -d\. -f1)\"" #-DFORCE_PC3_IDENT
MARCH := $(shell uname -m) ifeq ($(LIBVER),32)
ifeq ($(MARCH),x86_64)
CFLAGS += -m64
else
CFLAGS += -m32 CFLAGS += -m32
endif endif
@ -18,9 +15,7 @@ endif
SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so
all: $(SOBJECTS) all: $(SOBJECTS)
ifeq ($(MARCH),x86_64) @file libusb-driver.so | grep x86-64 >/dev/null && echo Built library is 64 bit. Run \`make lib32\' to build a 32 bit version || true
@echo Built library is 64 bit. Run \`make lib32\' to build a 32 bit version
endif
libusb-driver.so: usb-driver.c parport.c jtagkey.c config.c jtagmon.c usb-driver.h parport.h jtagkey.h config.h jtagmon.h Makefile libusb-driver.so: usb-driver.c parport.c jtagkey.c config.c jtagmon.c usb-driver.h parport.h jtagkey.h config.h jtagmon.h Makefile
$(CC) $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared $(CC) $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared
@ -29,7 +24,7 @@ libusb-driver-DEBUG.so: usb-driver.c parport.c jtagkey.c config.c jtagmon.c usb-
$(CC) -DDEBUG $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared $(CC) -DDEBUG $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared
lib32: lib32:
$(MAKE) MARCH=i386 clean all $(MAKE) LIBVER=32 clean all
clean: clean:
rm -f $(SOBJECTS) rm -f $(SOBJECTS)