Use CXXFLAGS instead of CFLAGS

Author: sjoelund

Compiler/runtime/Makefile.in

@@ -30,7 +30,7 @@ CC	= @CC@
 CXX	= @CXX@
 IDL	= @IDLCMD@
 IDLPYTHON = @IDLPYTHONCMD@
-CXXFLAGS = $(CFLAGS) @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I. $(CORBAINCL) -I$(FMIINCLUDE) -I$(top_builddir)/3rdParty/gc/include -I$(GRAPHSTREAMINCLUDE) -I$(GRAPHINCLUDE) -I$(CJSONINCLUDE)
 TRIPLE=@host_short@
 SHREXT=@SHREXT@

SimulationRuntime/c/Makefile.common

@@ -206,7 +206,7 @@ $(INITIALIZATIONOBJSPATH):%$(OBJ_EXT): %.c $(SOLVERHFILESPATH) $(INITIALIZATIONH
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 $(RESULTSOBJSPATH):%$(OBJ_EXT): %.cpp $(RESULTSFILESPATH) $(COMMON_HEADERS)
-	$(CXX) -c $(CFLAGS) -o $@ $<
+	$(CXX) -c $(CXXFLAGS) -o $@ $<
 
 $(SIMOBJSPATH):%$(OBJ_EXT): %.cpp linearization/linearize.cpp $(SIMHFILESPATH) $(COMMON_HEADERS)
 	$(CXX) -c -Ilinearization/ $(CXXFLAGS) -o $@ $<