pyrox.dev
1diff -ruN a/Makefile b/Makefile
2--- a/Makefile 2020-06-03 16:10:18.000000000 -0700
3+++ b/Makefile 2020-07-21 18:03:12.464121056 -0700
4@@ -42,7 +42,7 @@
5
6 PLATFORM := $(shell uname -s)
7 ifeq ($(PLATFORM),Linux)
8- CXX:= g++
9+ CXX?= g++
10
11 STATICOUTPUT := linux64
12
13@@ -68,7 +68,7 @@
14
15 HIDOBJ := $(LIBTHIRD)/hid-libusb.o
16 else
17- CXX:= clang++
18+ CXX?= clang++
19
20 OUTPUT := libmsp430.dylib
21 STATICOUTPUT := mac64
22@@ -134,7 +134,7 @@
23 $(CXX) -c -o $@ $< $(USE_PCH) $(CXXFLAGS) $(INCLUDES) $(DEFINES)
24
25 $(BSLLIB):
26- $(MAKE) -C ./ThirdParty/BSL430_DLL
27+ $(MAKE) -C ./ThirdParty/BSL430_DLL OUTPUT=../../$(BSLLIB)
28
29 install:
30 cp $(OUTPUT) /usr/local/lib/
31diff -ruN a/ThirdParty/BSL430_DLL/Makefile b/ThirdParty/BSL430_DLL/Makefile
32--- a/ThirdParty/BSL430_DLL/Makefile 2019-11-18 13:16:00.000000000 -0800
33+++ b/ThirdParty/BSL430_DLL/Makefile 2020-07-21 18:02:55.987782494 -0700
34@@ -36,7 +36,7 @@
35
36 PLATFORM := $(shell uname -s)
37 ifeq ($(PLATFORM),Linux)
38- CXX:= g++
39+ CXX?= g++
40
41 ifdef BIT32
42 CXXFLAGS += -m32
43@@ -47,7 +47,7 @@
44 INCLUDES += -I$(BOOST_DIR)
45 endif
46 else
47- CXX:= clang++
48+ CXX?= clang++
49
50 ifdef BOOST_DIR
51 INCLUDES += -I$(BOOST_DIR)/include