diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-12-28 10:05:09 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-12-28 10:05:09 +0000 |
| commit | da65b70772a7644517cd88bd8d02c5986377090c (patch) | |
| tree | 61102cfff30fda63c413db62d98621649ffa7bef /externals | |
| parent | 61befc7dbab7e2d87a8d6f4f391de9734690fe8a (diff) | |
oops, a couple more fixes needed, plus a bit of clean up never hurts
svn path=/trunk/; revision=4305
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/externals/Makefile b/externals/Makefile index 6ef8ab4a..94d2d549 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -429,17 +429,17 @@ freeverb_clean: #------------------------------------------------------------------------------# # 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_CFLAGS = $(CFLAGS) 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_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 endif @@ -450,9 +450,9 @@ $(HID_OBJECTS) : %.o : %.c $(CC) $(HID_CFLAGS) -o "$*.o" -c "$*.c" $(externals_src)/hcs/hid/hid.$(EXTENSION): $(HID_OBJECTS) - $(CC) $(LDFLAGS) -o "hid.$(EXTENSION)" $(HID_OBJECTS) $(HID_LIBS) - chmod a-x "$*.$(EXTENSION)" -# $(STRIP) $*.$(EXTENSION) + $(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) |