externals Makefile,1.29,1.30 - Pd-cvs

28 Dec 2005


      Update of /cvsroot/pure-data/externals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2266
Modified Files:
    Makefile 
Log Message:
oops, a couple more fixes needed, plus a bit of clean up never hurts
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Makefile	28 Dec 2005 09:57:57 -0000	1.29
--- Makefile	28 Dec 2005 10:05:09 -0000	1.30
***************
*** 430,444 ****
  # HID
  HID_NAME = hid
- HID_INCLUDES = -I$(externals_src)/hcs/hid -I$(pd_src)/src
- HID_CFLAGS = $(CFLAGS) $(HID_INCLUDES)
  ifeq ($(OS_NAME),windows)
    HID_LIBS = $(LIBS) -lhid -lsetupapi
  else
    ifeq ($(OS_NAME),darwin)
      FRAMEWORKS = Carbon IOKit ForceFeedback
! 	HID_CFLAGS += -I$(externals_src)/hcs/hid/HID\ Utilities\ Source
      HID_LIBS = $(LIBS) -L$(externals_src)/hcs/hid/HID\ Utilities\ Source/build \
         -lHIDUtilities $(patsubst %,-weak_framework %,$(FRAMEWORKS))
    else
      HID_LIBS = $(LIBS)
    endif
--- 430,444 ----
  # HID
  HID_NAME = hid
  ifeq ($(OS_NAME),windows)
+   HID_CFLAGS = $(CFLAGS) 
    HID_LIBS = $(LIBS) -lhid -lsetupapi
  else
    ifeq ($(OS_NAME),darwin)
      FRAMEWORKS = Carbon IOKit ForceFeedback
! 	HID_CFLAGS = $(CFLAGS) -I$(externals_src)/hcs/hid/HID\ Utilities\ Source
      HID_LIBS = $(LIBS) -L$(externals_src)/hcs/hid/HID\ Utilities\ Source/build \
         -lHIDUtilities $(patsubst %,-weak_framework %,$(FRAMEWORKS))
    else
+     HID_CFLAGS = $(CFLAGS) 
      HID_LIBS = $(LIBS)
    endif
***************
*** 451,457 ****
$(externals_src)/hcs/hid/hid.$(EXTENSION): $(HID_OBJECTS)
! 	$(CC) $(LDFLAGS) -o "hid.$(EXTENSION)"  $(HID_OBJECTS) $(HID_LIBS)
! 	chmod a-x "$*.$(EXTENSION)"
! #	$(STRIP) $*.$(EXTENSION)
hid: $(externals_src)/hcs/hid/hid.$(EXTENSION)
--- 451,457 ----
$(externals_src)/hcs/hid/hid.$(EXTENSION): $(HID_OBJECTS)
! 	$(CC) $(LDFLAGS) -o $(externals_src)/hcs/hid/hid.$(EXTENSION) \
! 		$(HID_OBJECTS) $(HID_LIBS)
! 	$(STRIP) $(externals_src)/hcs/hid/hid.$(EXTENSION)
hid: $(externals_src)/hcs/hid/hid.$(EXTENSION)