0a74126b8b608aea2ca1d6683abf94e78127205d

diff --git a/vscode-avr-c-cpp/arduino-nano-1/Makefile b/vscode-avr-c-cpp/arduino-nano-1/Makefile
index 7e1fa9d5ee377f5c520f1f924313e7a450ecc3c8..3a56c1821cf9fa5efd142db10621a6eba7e90b86 100644 (file)
--- a/vscode-avr-c-cpp/arduino-nano-1/Makefile
+++ b/vscode-avr-c-cpp/arduino-nano-1/Makefile
@@ -21,7 +21,8 @@ OBJ = $(OBJ_CPP:src/%.c=build/%.o)
 OBJ_SIM_CPP = $(SRC:src/%.cpp=sim/build/%.o)
 OBJ_SIM = $(OBJ_SIM_CPP:src/%.c=sim/build/%.o)
 
-CC= avr-g++
+CCP= avr-g++
+CC= avr-gcc
 
 CFLAGS= -Wall -mmcu=$(DEVICE) -Os -DF_CPU=$(CPU_FREQUENCE) -c
 CFLAGS += 
@@ -90,7 +91,7 @@ build/%.o: src/%.c
 
 build/%.o: src/%.cpp
        @mkdir -p $(dir $@)
-       $(CC) $(CFLAGS) -o $@ $<
+       $(CCP) $(CFLAGS) -o $@ $<
 
 # --------------------------------------------------------------------------------
 # simulation/debugging with gdb or simuc

diff --git a/vscode-avr-c-cpp/nano-1284-1/Makefile b/vscode-avr-c-cpp/nano-1284-1/Makefile
index e95febdf23ae2051e8eb14a2782710768fcf2a78..8a811270ab20685e6c24c3bac312fbb1adf98274 100644 (file)
--- a/vscode-avr-c-cpp/nano-1284-1/Makefile
+++ b/vscode-avr-c-cpp/nano-1284-1/Makefile
@@ -21,7 +21,8 @@ OBJ = $(OBJ_CPP:src/%.c=build/%.o)
 OBJ_SIM_CPP = $(SRC:src/%.cpp=sim/build/%.o)
 OBJ_SIM = $(OBJ_SIM_CPP:src/%.c=sim/build/%.o)
 
-CC= avr-g++
+CCP= avr-g++
+CC= avr-gcc
 
 CFLAGS= -Wall -mmcu=$(DEVICE) -Os -DF_CPU=$(CPU_FREQUENCE) -c
 CFLAGS += 
@@ -90,7 +91,7 @@ build/%.o: src/%.c
 
 build/%.o: src/%.cpp
        @mkdir -p $(dir $@)
-       $(CC) $(CFLAGS) -o $@ $<
+       $(CCP) $(CFLAGS) -o $@ $<
 
 # --------------------------------------------------------------------------------
 # simulation/debugging with gdb or simuc

diff --git a/vscode-avr-c-cpp/nano-644-1/Makefile b/vscode-avr-c-cpp/nano-644-1/Makefile
index 03912d7870eae3c71814d45a7c88594d42045653..a93c8d06169b76aa161c11a29d85671ed54b20e7 100644 (file)
--- a/vscode-avr-c-cpp/nano-644-1/Makefile
+++ b/vscode-avr-c-cpp/nano-644-1/Makefile
@@ -21,7 +21,8 @@ OBJ = $(OBJ_CPP:src/%.c=build/%.o)
 OBJ_SIM_CPP = $(SRC:src/%.cpp=sim/build/%.o)
 OBJ_SIM = $(OBJ_SIM_CPP:src/%.c=sim/build/%.o)
 
-CC= avr-g++
+CCP= avr-g++
+CC= avr-gcc
 
 CFLAGS= -Wall -mmcu=$(DEVICE) -Os -DF_CPU=$(CPU_FREQUENCE) -c
 CFLAGS += 
@@ -90,7 +91,7 @@ build/%.o: src/%.c
 
 build/%.o: src/%.cpp
        @mkdir -p $(dir $@)
-       $(CC) $(CFLAGS) -o $@ $<
+       $(CCP) $(CFLAGS) -o $@ $<
 
 # --------------------------------------------------------------------------------
 # simulation/debugging with gdb or simuc

diff --git a/vscode-avr-c-cpp/sure-1/Makefile b/vscode-avr-c-cpp/sure-1/Makefile
index cbde53ee28ceebe62327cf04e056f56f006d77c6..fc7cfc56b9999eabf59df20e8b7348488fcc3723 100644 (file)
--- a/vscode-avr-c-cpp/sure-1/Makefile
+++ b/vscode-avr-c-cpp/sure-1/Makefile
@@ -21,7 +21,8 @@ OBJ = $(OBJ_CPP:src/%.c=build/%.o)
 OBJ_SIM_CPP = $(SRC:src/%.cpp=sim/build/%.o)
 OBJ_SIM = $(OBJ_SIM_CPP:src/%.c=sim/build/%.o)
 
-CC= avr-g++
+CCP= avr-g++
+CC= avr-gcc
 
 CFLAGS= -Wall -mmcu=$(DEVICE) -Os -DF_CPU=$(CPU_FREQUENCE) -c
 CFLAGS += 
@@ -90,7 +91,7 @@ build/%.o: src/%.c
 
 build/%.o: src/%.cpp
        @mkdir -p $(dir $@)
-       $(CC) $(CFLAGS) -o $@ $<
+       $(CCP) $(CFLAGS) -o $@ $<
 
 # --------------------------------------------------------------------------------
 # simulation/debugging with gdb or simuc