Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6805
Modified Files: Makefile TODO Log Message: fix hid vs. hidio building; simplified cross-platform CFLAGS handling
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** Makefile 11 Dec 2006 06:44:29 -0000 1.104 --- Makefile 11 Dec 2006 14:54:06 -0000 1.105 *************** *** 44,49 **** BUILDSRC_OS_NAME = $(OS_NAME)
! #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 --- 44,48 ---- BUILDSRC_OS_NAME = $(OS_NAME)
! CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src -Wall -W $(DEBUG_CFLAGS) LDFLAGS = LIBS = -lm *************** *** 56,85 **** DYLIB_EXTENSION = dylib STRIP = strip -x ! else ! ifeq ($(OS_NAME),windows) ! BUILDSRC_OS_NAME = win ! WINDOWS_HACKS = -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \ ! -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)' # These don't seem to be needed: # -D'PROT_READ=1' \ # -D'MAP_PRIVATE=2' \ # -D'O_NDELAY=O_NONBLOCK' ! CFLAGS += -mms-bitfields -DMSW -DNT $(WINDOWS_HACKS) ! LDFLAGS += -shared # all of these included libs are part of libc in UNIX platforms. All except # libregex are in DLLs, so they get stripped from the external's .dll binary ! LIBS += -L$(pd_src)/bin -L$(pd_src)/obj -lpd \ ! -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex ! DYLIB_LDFLAGS = -shared ! DYLIB_EXTENSION = so ! STRIP = strip --strip-unneeded -R .note -R .comment ! else ! CFLAGS += -DUNIX -Dunix -fPIC ! LDFLAGS += -Wl,-export_dynamic -shared ! LIBS += -lc ! DYLIB_LDFLAGS = $(LDFLAGS) ! DYLIB_EXTENSION = dll ! STRIP = strip --strip-unneeded -R .note -R .comment ! endif endif
--- 55,84 ---- DYLIB_EXTENSION = dylib STRIP = strip -x ! endif ! ifeq ($(OS_NAME),linux) ! CFLAGS += -DUNIX -Dunix -fPIC ! LDFLAGS += -Wl,-export_dynamic -shared ! LIBS += -lc ! DYLIB_LDFLAGS = $(LDFLAGS) ! DYLIB_EXTENSION = dll ! STRIP = strip --strip-unneeded -R .note -R .comment ! endif ! ifeq ($(OS_NAME),windows) ! BUILDSRC_OS_NAME = win ! WINDOWS_HACKS = -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \ ! -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)' # These don't seem to be needed: # -D'PROT_READ=1' \ # -D'MAP_PRIVATE=2' \ # -D'O_NDELAY=O_NONBLOCK' ! CFLAGS += -mms-bitfields -DMSW -DNT $(WINDOWS_HACKS) ! LDFLAGS += -shared # all of these included libs are part of libc in UNIX platforms. All except # libregex are in DLLs, so they get stripped from the external's .dll binary ! LIBS += -L$(pd_src)/bin -L$(pd_src)/obj -lpd \ ! -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex ! DYLIB_LDFLAGS = -shared ! DYLIB_EXTENSION = so ! STRIP = strip --strip-unneeded -R .note -R .comment endif
*************** *** 944,948 **** $(CC) $(HID_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 --- 943,947 ---- $(CC) $(HID_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 *************** *** 955,959 ****
$(externals_src)/hcs/hid/hid.$(EXTENSION): $(HID_OBJECTS) \ ! $(HID_UTILITIES_SOURCE)/build/libHIDUtilities.a $(CC) $(LDFLAGS) -o $(externals_src)/hcs/hid/hid.$(EXTENSION) \ $(HID_OBJECTS) $(HID_LIBS) --- 954,958 ----
$(externals_src)/hcs/hid/hid.$(EXTENSION): $(HID_OBJECTS) \ ! $(HID_UTILITIES_SOURCE)/build/Default/libHIDUtilities.a $(CC) $(LDFLAGS) -o $(externals_src)/hcs/hid/hid.$(EXTENSION) \ $(HID_OBJECTS) $(HID_LIBS) *************** *** 979,986 **** hid_clean: -rm -f -- $(externals_src)/hcs/hid/*.o ! -rm -f -- $(externals_src)/hcs/hid/*.$(EXTENSION) -rm -f -- $(externals_src)/hcs/hid/*.bak -rm -f -- $(externals_src)/hcs/hid/*.*~ -rm -f -- $(HID_UTILITIES_SOURCE)/build/libHIDUtilities.a
--- 978,986 ---- hid_clean: -rm -f -- $(externals_src)/hcs/hid/*.o ! -rm -f -- $(externals_src)/hcs/hid/hid.$(EXTENSION) -rm -f -- $(externals_src)/hcs/hid/*.bak -rm -f -- $(externals_src)/hcs/hid/*.*~ -rm -f -- $(HID_UTILITIES_SOURCE)/build/libHIDUtilities.a + -rm -f -- $(HID_UTILITIES_SOURCE)/build/Default/libHIDUtilities.a
*************** *** 1037,1043 **** 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 --- 1037,1043 ---- FRAMEWORKS = Carbon IOKit ForceFeedback HIDIO_CFLAGS = $(CFLAGS) -I$(externals_src)/io/hidio/HID\ Utilities\ Source ! HIDIO_HID_UTILITIES_SOURCE = $(externals_src)/io/hidio/HID\ Utilities\ Source ! HIDIO_LIBS = $(LIBS) -L$(HIDIO_HID_UTILITIES_SOURCE)/build \ ! -L$(HIDIO_HID_UTILITIES_SOURCE)/build/Default \ -lHIDUtilities $(patsubst %,-weak_framework %,$(FRAMEWORKS)) endif *************** *** 1052,1060 **** $(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 ifeq ($(UNAME),Darwin) ! cd $(HID_UTILITIES_SOURCE) && \ (test -x /usr/bin/xcodebuild && /usr/bin/xcodebuild) || \ (test -x /usr/bin/pbxbuild && /usr/bin/pbxbuild) || \ --- 1052,1060 ---- $(CC) $(HIDIO_CFLAGS) -o "$*.o" -c "$*.c"
! $(HIDIO_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 ifeq ($(UNAME),Darwin) ! cd $(HIDIO_HID_UTILITIES_SOURCE) && \ (test -x /usr/bin/xcodebuild && /usr/bin/xcodebuild) || \ (test -x /usr/bin/pbxbuild && /usr/bin/pbxbuild) || \ *************** *** 1063,1067 ****
$(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) --- 1063,1067 ----
$(externals_src)/io/hidio/hidio.$(EXTENSION): $(HIDIO_OBJECTS) \ ! $(HIDIO_HID_UTILITIES_SOURCE)/build/Default/libHIDUtilities.a $(CC) $(LDFLAGS) -o $(externals_src)/io/hidio/hidio.$(EXTENSION) \ $(HIDIO_OBJECTS) $(HIDIO_LIBS) *************** *** 1090,1095 **** -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
--- 1090,1095 ---- -rm -f -- $(externals_src)/io/hidio/*.bak -rm -f -- $(externals_src)/io/hidio/*.*~ ! -rm -f -- $(HIDIO_HID_UTILITIES_SOURCE)/build/libHIDUtilities.a ! -rm -f -- $(HIDIO_HID_UTILITIES_SOURCE)/build/Default/libHIDUtilities.a
Index: TODO =================================================================== RCS file: /cvsroot/pure-data/externals/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TODO 11 Dec 2006 03:16:36 -0000 1.3 --- TODO 11 Dec 2006 14:54:06 -0000 1.4 *************** *** 11,19 **** functionality
- - put objects with conflicting names into a directory namespace - - Gem/scale - flext/prepend - - add these to the build system: PDContainer --- 11,14 ----