diff --git a/mspflasher/libmsp430/Makefile b/mspflasher/libmsp430/Makefile index 31e53a9..273fa10 100644 --- a/mspflasher/libmsp430/Makefile +++ b/mspflasher/libmsp430/Makefile @@ -1,3 +1,6 @@ +CC = arm-linux-gnueabihf- +BIT32 = 1 + CXXFLAGS := -fPIC -std=c++0x -fvisibility=hidden -fvisibility-inlines-hidden \ -I/usr/include/hidapi @@ -44,11 +47,10 @@ LIBDIRS := -L$(LIBTHIRD) PLATFORM := $(shell uname -s) ifeq ($(PLATFORM),Linux) - CXX:= g++ + CXX:= $(CC)g++ ifdef BIT32 STATICOUTPUT := linux32 - CXXFLAGS += -m32 LIBTHIRD = ./ThirdParty/lib LIBDIRS = -L$(LIBTHIRD) else @@ -64,7 +66,7 @@ ifeq ($(PLATFORM),Linux) LIBS += -lusb-1.0 endif - LIBS += -lusb-1.0 -lrt -lpthread + LIBS += -lrt -lpthread ifdef BOOST_DIR INCLUDES += -I$(BOOST_DIR) @@ -143,14 +145,14 @@ $(PCH_COMPILED): $(PCH_HEADER) $(CXX) -c -o $@ $< $(USE_PCH) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(BSLLIB): - $(MAKE) -C ./ThirdParty/BSL430_DLL + $(MAKE) CROSS_COMPILE=${CC} -C ./ThirdParty/BSL430_DLL install: cp $(OUTPUT) /usr/local/lib/ ldconfig clean: - $(MAKE) -C ./ThirdParty/BSL430_DLL clean + $(MAKE) CROSS_COMPILE=${CC} -C ./ThirdParty/BSL430_DLL clean @for i in $(OBJS); do rm -f $$i; done @rm -f $(PCH_HEADER).?ch build.log rm -f $(STATICOUTPUT).a diff --git a/mspflasher/libmsp430/ThirdParty/BSL430_DLL/Makefile b/mspflasher/libmsp430/ThirdParty/BSL430_DLL/Makefile index 8d845cb..a1bd522 100644 --- a/mspflasher/libmsp430/ThirdParty/BSL430_DLL/Makefile +++ b/mspflasher/libmsp430/ThirdParty/BSL430_DLL/Makefile @@ -1,3 +1,5 @@ +CC = arm-linux-gnueabihf- + CXXFLAGS := -fPIC -std=c++0x -fvisibility=hidden -fvisibility-inlines-hidden \ -I/usr/include/hidapi @@ -37,10 +39,9 @@ OUTPUT := ../lib64/libbsl430.a PLATFORM := $(shell uname -s) ifeq ($(PLATFORM),Linux) - CXX:= g++ + CXX:= $(CC)g++ ifdef BIT32 - CXXFLAGS += -m32 OUTPUT := ../lib/libbsl430.a endif