diff --git a/Makefile b/Makefile
index 28f3880..d1c7cf3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 include ./config.mk
+export
 
-CXXFLAGS += -std=c++11
+CXXFLAGS_release := -O3
+CFLAGS_release := -O3
 TARGET_ARCH := -march=native
 
 LIBDIR := -L$(LIBSRC_PATH)/fir -L$(LIBSRC_PATH)/crc -L$(LIBSRC_PATH)/radio
@@ -11,8 +13,8 @@ DEFINES += -DPROCESSOR_BUFFER_USE_EXCEPTIONS
 all: app 
 app: objects link
 objects: 
-	@$(MAKE) -C JuceLibraryCode BUILD_DIR=$(BUILD_DIR)
-	@$(MAKE) -C Source BUILD_DIR=$(BUILD_DIR)
-	@$(MAKE) -C Radio BUILD_DIR=$(BUILD_DIR)
+	@$(MAKE) -C JuceLibraryCode
+	@$(MAKE) -C Source
+	@$(MAKE) -C Radio
 	
 include $(MAKE_HOME)/compile.mk
diff --git a/Source/Makefile b/Source/Makefile
index c699132..669ac15 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -2,17 +2,16 @@ include ./config.mk
 
 NAME := Source
 
-SOURCES := GraphComponent.cpp
-SOURCES += LogComponent.cpp
-SOURCES += Receiver.cpp
-SOURCES += Transmitter.cpp
-SOURCES += ControlComponent.cpp
-SOURCES += IQPoint.cpp
-SOURCES += IQPlaneComponent.cpp
-SOURCES += MainComponent.cpp
-SOURCES += Main.cpp
+CXX_SRCS := GraphComponent.cpp
+CXX_SRCS += LogComponent.cpp
+CXX_SRCS += Receiver.cpp
+CXX_SRCS += Transmitter.cpp
+CXX_SRCS += ControlComponent.cpp
+CXX_SRCS += IQPoint.cpp
+CXX_SRCS += IQPlaneComponent.cpp
+CXX_SRCS += MainComponent.cpp
+CXX_SRCS += Main.cpp
 
-CXX_SRCS += $(SOURCES)
 INCLUDES += -I . -I $(realpath ../JuceLibraryCode) -I $(JUCE_PATH) -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
 
 include $(MAKE_HOME)/compile.mk