Make Makefile platform independent

diff --git a/Makefile b/Makefile
index 0ed7d5f5f1cfddc39c67b0ec95d4e57493a9ea71..cf0297061ae9d4f4c6734dc53382db526914397a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@
 # See http://processors.wiki.ti.com/index.php/Projects_-_Command_Line_Build/Create
 # and https://bugs.eclipse.org/bugs/show_bug.cgi?id=186847
 
+include rpp-lib/Makefile.var
+
 all: rpp-test-sw
        $(call rmdir,$(TMP_WORKSPACE))
 
@@ -52,13 +54,13 @@ $(RELEASE_BASENAME):: lib
        $(MAKE) -C $@/rpp-test-sw/Debug -f $(CURDIR)/rpp-test-sw/Makefile.version version.h
 
        mkdir -p $@/rpp-lib/rpp/
-       mkdir -p $@/rpp-lib/os/7.0.2
+       mkdir -p $@/rpp-lib/os/$(rpp_lib_OS)
 
        cp --parents rpp-lib/rpp-lib.lib rpp-lib/common.mk $@/
        cp --parents rpp-lib/.ccsproject rpp-lib/.cproject rpp-lib/.project $@/
        cp -r rpp-lib/rpp/include $@/rpp-lib/rpp/include
-       cp rpp-lib/rpp/RM48L952FlashLnk.cmd $@/rpp-lib/rpp/RM48L952FlashLnk.cmd
-       cp -r rpp-lib/os/7.0.2/include $@/rpp-lib/os/7.0.2/include
+       cp rpp-lib/rpp/$(rpp_lib_$(TARGET)_LD_SCRIPT) $@/rpp-lib/rpp/$(rpp_lib_$(TARGET)_LD_SCRIPT)
+       cp -r rpp-lib/os/$(rpp_lib_OS)/include $@/rpp-lib/os/$(rpp_lib_OS)/include
 
 lib:
        $(MAKE) -C rpp-lib/Release

diff --git a/rpp-lib b/rpp-lib
index bc0c9a5d9c4c8d61418966b54e6416af0843c5d5..5494f00661df434de0842bc7c05d04ab4c9dc1be 160000 (submodule)
--- a/rpp-lib
+++ b/rpp-lib
@@ -1 +1 @@
-Subproject commit bc0c9a5d9c4c8d61418966b54e6416af0843c5d5
+Subproject commit 5494f00661df434de0842bc7c05d04ab4c9dc1be