blob: 4b4f788aab73d7d68674e9dcc467a624c457fc14 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- Makefile.orig 2016-04-11 14:08:50.000000000 +0200
+++ Makefile 2016-05-02 09:51:27.848060000 +0200
@@ -16,6 +16,7 @@
USE_PCH += -include $(PCH_HEADER)
export BOOST_DIR
+export HIDAPI_DIR
export BIT32
export STATIC
export DEBUG
@@ -76,15 +77,15 @@
HIDOBJ := $(LIBTHIRD)/hid-libusb.o
else
- CXX:= clang++
+# CXX:= clang++
- OUTPUT := libmsp430.dylib
- STATICOUTPUT := mac64
+ OUTPUT := libmsp430.so
+ STATICOUTPUT := libmsp430
ifdef STATIC
- STATIC_LIBS += -framework CoreFoundation -framework IOKit -lhidapi
+ STATIC_LIBS += -lhidapi
else
- LIBS += -framework CoreFoundation -framework IOKit -lhidapi
+ LIBS += -lhidapi
endif
ifdef BOOST_DIR
@@ -92,9 +93,14 @@
LIBDIRS += -L$(BOOST_DIR)/lib
endif
- OUTNAME := -install_name
- BSTATIC :=
- BDYNAMIC :=
+ ifdef HIDAPI_DIR
+ INCLUDES += -I$(HIDAPI_DIR)/include/hidapi
+ LIBDIRS += -L$(HIDAPI_DIR)/lib
+ endif
+
+ OUTNAME := -Wl,-soname,
+ BSTATIC := -Wl,-Bstatic
+ BDYNAMIC := -Wl,-Bdynamic
HIDOBJ :=
endif
|
