Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11336
Modified Files: Makefile Log Message:
- added new file to [hidio] to support new event naming scheme
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** Makefile 30 Nov 2006 06:14:59 -0000 1.101 --- Makefile 8 Dec 2006 15:17:26 -0000 1.102 *************** *** 45,49 ****
#CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src -Wall -W $(DEBUG_CFLAGS) ! CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src -W $(DEBUG_CFLAGS) LDFLAGS = LIBS = -lm --- 45,49 ----
#CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src -Wall -W $(DEBUG_CFLAGS) ! CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src -W $(DEBUG_CFLAGS) -ftree-vectorize -ftree-vectorizer-verbose=3 LDFLAGS = LIBS = -lm *************** *** 1031,1056 **** HIDIO_NAME = hidio ifeq ($(OS_NAME),windows) HIDIO_CFLAGS = $(CFLAGS) HIDIO_LIBS = $(LIBS) -lhid -lsetupapi ! else ! ifeq ($(OS_NAME),darwin) ! FRAMEWORKS = Carbon IOKit ForceFeedback ! HIDIO_CFLAGS = $(CFLAGS) -I$(externals_src)/io/hidio/HID\ Utilities\ Source ! HID_UTILITIES_SOURCE = $(externals_src)/io/hidio/HID\ Utilities\ Source ! HIDIO_LIBS = $(LIBS) -L$(HID_UTILITIES_SOURCE)/build \ ! -L$(HID_UTILITIES_SOURCE)/build/Default \ ! -lHIDUtilities $(patsubst %,-weak_framework %,$(FRAMEWORKS)) ! else ! HIDIO_CFLAGS = $(CFLAGS) ! HIDIO_LIBS = $(LIBS) ! endif endif
- HIDIO_SRC = input_arrays.c hidio_$(OS_NAME).c hidio.c HIDIO_OBJECTS := $(patsubst %.c, $(externals_src)/io/hidio/%.o, $(HIDIO_SRC)) $(HIDIO_OBJECTS) : %.o : %.c $(CC) $(HIDIO_CFLAGS) -o "$*.o" -c "$*.c"
! $(HID_UTILITIES_SOURCE)/build/libHIDUtilities.a: # Apple changed the XCode CLI tool's name in xcode2... arg # if on non-Mac OS X, this target just echos a message --- 1031,1058 ---- HIDIO_NAME = hidio ifeq ($(OS_NAME),windows) + HIDIO_SRC = hidio_windows.c hidio_types.c hidio.c HIDIO_CFLAGS = $(CFLAGS) HIDIO_LIBS = $(LIBS) -lhid -lsetupapi ! endif ! ifeq ($(OS_NAME),darwin) ! HIDIO_SRC = hidio_darwin.c hidio_types.c hidio.c ! FRAMEWORKS = Carbon IOKit ForceFeedback ! HIDIO_CFLAGS = $(CFLAGS) -I$(externals_src)/io/hidio/HID\ Utilities\ Source ! HID_UTILITIES_SOURCE = $(externals_src)/io/hidio/HID\ Utilities\ Source ! HIDIO_LIBS = $(LIBS) -L$(HID_UTILITIES_SOURCE)/build \ ! -L$(HID_UTILITIES_SOURCE)/build/Default \ ! -lHIDUtilities $(patsubst %,-weak_framework %,$(FRAMEWORKS)) ! endif ! ifeq ($(OS_NAME),linux) ! HIDIO_SRC = input_arrays.c hidio_linux.c hidio_types.c hidio.c ! HIDIO_CFLAGS = $(CFLAGS) ! HIDIO_LIBS = $(LIBS) endif
HIDIO_OBJECTS := $(patsubst %.c, $(externals_src)/io/hidio/%.o, $(HIDIO_SRC)) $(HIDIO_OBJECTS) : %.o : %.c $(CC) $(HIDIO_CFLAGS) -o "$*.o" -c "$*.c"
! $(HID_UTILITIES_SOURCE)/build/Default/libHIDUtilities.a: # Apple changed the XCode CLI tool's name in xcode2... arg # if on non-Mac OS X, this target just echos a message *************** *** 1063,1067 ****
$(externals_src)/io/hidio/hidio.$(EXTENSION): $(HIDIO_OBJECTS) \ ! $(HID_UTILITIES_SOURCE)/build/libHIDUtilities.a $(CC) $(LDFLAGS) -o $(externals_src)/io/hidio/hidio.$(EXTENSION) \ $(HIDIO_OBJECTS) $(HIDIO_LIBS) --- 1065,1069 ----
$(externals_src)/io/hidio/hidio.$(EXTENSION): $(HIDIO_OBJECTS) \ ! $(HID_UTILITIES_SOURCE)/build/Default/libHIDUtilities.a $(CC) $(LDFLAGS) -o $(externals_src)/io/hidio/hidio.$(EXTENSION) \ $(HIDIO_OBJECTS) $(HIDIO_LIBS) *************** *** 1086,1094 ****
hidio_clean: ! -rm -f -- $(externals_src)/io/hidio/*.o ! -rm -f -- $(externals_src)/io/hidio/*.$(EXTENSION) -rm -f -- $(externals_src)/io/hidio/*.bak -rm -f -- $(externals_src)/io/hidio/*.*~ -rm -f -- $(HID_UTILITIES_SOURCE)/build/libHIDUtilities.a
--- 1088,1097 ----
hidio_clean: ! -rm -f -- $(HIDIO_OBJECTS:.c=.o) ! -rm -f -- $(HIDIO_OBJECTS:.c=.$(EXTENSION)) -rm -f -- $(externals_src)/io/hidio/*.bak -rm -f -- $(externals_src)/io/hidio/*.*~ -rm -f -- $(HID_UTILITIES_SOURCE)/build/libHIDUtilities.a + -rm -f -- $(HID_UTILITIES_SOURCE)/build/Default/libHIDUtilities.a
*************** *** 1780,1784 **** $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PIDIP_NAME) \ --author "Yves Degoyon" \ ! --description "PiDiP is Definitely in Pieces" -install -p $(externals_src)/pidip/*.$(EXTENSION) $(objectsdir)/$(PIDIP_NAME) install -d $(helpdir)/$(PIDIP_NAME) --- 1783,1788 ---- $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PIDIP_NAME) \ --author "Yves Degoyon" \ ! --description "PiDiP is Definitely in Pieces" \ ! --license "GNU GPLv2" -install -p $(externals_src)/pidip/*.$(EXTENSION) $(objectsdir)/$(PIDIP_NAME) install -d $(helpdir)/$(PIDIP_NAME)