Makefile: Centralize and update Debug/Release compile flags

Release build should be compiled without asserts, hence NDEBUG.

diff --git a/build/Makefile.lib.inc b/build/Makefile.lib.inc
index 2418450ddf5bfbc8eeb849a0b845c9e8f0953fa3..60f5d2b0eb4be3213e2560922c095d25574402a1 100644 (file)
--- a/build/Makefile.lib.inc
+++ b/build/Makefile.lib.inc
@@ -31,6 +31,12 @@ include $(makefile_lib_inc_dir)/../Makefile.var
 include $(makefile_lib_inc_dir)/../common.mk
 include $(makefile_lib_inc_dir)/Makefile.rules
 
+ifeq ($(rpp_lib_DEBUG),1)
+RPP_CFLAGS += -g -O0
+else
+RPP_CFLAGS += -O2 -DNDEBUG
+endif
+
 rpp_lib_c_OBJS   = $(addsuffix .obj,$(basename $(filter %.c,   $(rpp_lib_SOURCES))))
 rpp_lib_asm_OBJS = $(addsuffix .obj,$(basename $(filter %.asm, $(rpp_lib_SOURCES))))
 rpp_lib_OBJS = $(rpp_lib_c_OBJS) $(rpp_lib_asm_OBJS)

diff --git a/build/rm48_hdk/Debug/GNUmakefile b/build/rm48_hdk/Debug/GNUmakefile
index 6d47e9e259ee0e7500b0b5832a08e02fa3e77c96..4f85678f9013e58b14239f44a99782fd059af469 100644 (file)
--- a/build/rm48_hdk/Debug/GNUmakefile
+++ b/build/rm48_hdk/Debug/GNUmakefile
@@ -1,3 +1,2 @@
+rpp_lib_DEBUG = 1
 include ../../Makefile.lib.inc
-
-RPP_CFLAGS += -g -O0

diff --git a/build/rm48_hdk/Release/GNUmakefile b/build/rm48_hdk/Release/GNUmakefile
index 16367b2e0e3f17da85f6ff0b66c55efe81262ea9..8f2db8b7cfdb0f271cf4c0174b6aa66f701615f6 100644 (file)
--- a/build/rm48_hdk/Release/GNUmakefile
+++ b/build/rm48_hdk/Release/GNUmakefile
@@ -1,3 +1,2 @@
+rpp_lib_DEBUG = 0
 include ../../Makefile.lib.inc
-
-RPP_CFLAGS += -O2

diff --git a/build/tms570_hdk/Debug/GNUmakefile b/build/tms570_hdk/Debug/GNUmakefile
index 6d47e9e259ee0e7500b0b5832a08e02fa3e77c96..4f85678f9013e58b14239f44a99782fd059af469 100644 (file)
--- a/build/tms570_hdk/Debug/GNUmakefile
+++ b/build/tms570_hdk/Debug/GNUmakefile
@@ -1,3 +1,2 @@
+rpp_lib_DEBUG = 1
 include ../../Makefile.lib.inc
-
-RPP_CFLAGS += -g -O0

diff --git a/build/tms570_hdk/Release/GNUmakefile b/build/tms570_hdk/Release/GNUmakefile
index 16367b2e0e3f17da85f6ff0b66c55efe81262ea9..8f2db8b7cfdb0f271cf4c0174b6aa66f701615f6 100644 (file)
--- a/build/tms570_hdk/Release/GNUmakefile
+++ b/build/tms570_hdk/Release/GNUmakefile
@@ -1,3 +1,2 @@
+rpp_lib_DEBUG = 0
 include ../../Makefile.lib.inc
-
-RPP_CFLAGS += -O2

diff --git a/build/tms570_hydctr/Debug/GNUmakefile b/build/tms570_hydctr/Debug/GNUmakefile
index 6d47e9e259ee0e7500b0b5832a08e02fa3e77c96..4f85678f9013e58b14239f44a99782fd059af469 100644 (file)
--- a/build/tms570_hydctr/Debug/GNUmakefile
+++ b/build/tms570_hydctr/Debug/GNUmakefile
@@ -1,3 +1,2 @@
+rpp_lib_DEBUG = 1
 include ../../Makefile.lib.inc
-
-RPP_CFLAGS += -g -O0

diff --git a/build/tms570_hydctr/Release/GNUmakefile b/build/tms570_hydctr/Release/GNUmakefile
index 16367b2e0e3f17da85f6ff0b66c55efe81262ea9..8f2db8b7cfdb0f271cf4c0174b6aa66f701615f6 100644 (file)
--- a/build/tms570_hydctr/Release/GNUmakefile
+++ b/build/tms570_hydctr/Release/GNUmakefile
@@ -1,3 +1,2 @@
+rpp_lib_DEBUG = 0
 include ../../Makefile.lib.inc
-
-RPP_CFLAGS += -O2

diff --git a/build/tms570_rpp/Debug/GNUmakefile b/build/tms570_rpp/Debug/GNUmakefile
index 6d47e9e259ee0e7500b0b5832a08e02fa3e77c96..4f85678f9013e58b14239f44a99782fd059af469 100644 (file)
--- a/build/tms570_rpp/Debug/GNUmakefile
+++ b/build/tms570_rpp/Debug/GNUmakefile
@@ -1,3 +1,2 @@
+rpp_lib_DEBUG = 1
 include ../../Makefile.lib.inc
-
-RPP_CFLAGS += -g -O0

diff --git a/build/tms570_rpp/Release/GNUmakefile b/build/tms570_rpp/Release/GNUmakefile
index 16367b2e0e3f17da85f6ff0b66c55efe81262ea9..8f2db8b7cfdb0f271cf4c0174b6aa66f701615f6 100644 (file)
--- a/build/tms570_rpp/Release/GNUmakefile
+++ b/build/tms570_rpp/Release/GNUmakefile
@@ -1,3 +1,2 @@
+rpp_lib_DEBUG = 0
 include ../../Makefile.lib.inc
-
-RPP_CFLAGS += -O2