Change some makefile build stuff

Author: mls-m5

include/matgui/view.h

@@ -9,7 +9,8 @@
 
 #include "matsig.h"
 #include "memberproperties.h"
-#include "style.h"
+#include "paint.h"
+#include <string>
 
 namespace matgui {
 
@@ -47,7 +48,7 @@ class View {
 
     //! Trigger a redraw
     virtual void invalidate();
-    virtual void refresh(){};
+    virtual void refresh() {};
     virtual void updateStyle() {
         currentStyle = style;
         currentStyle += hoverStyle;

tests/Makefile

@@ -4,16 +4,20 @@ RUNSTRING=./${TARGET}
 OBJECTS=signal-test.o font-test.o shadertranslate-test.o
 LIBS= -lpthread `sdl2-config --libs` -lGL -lSDL2_ttf -lSDL2_image
 CXXFLAGS=-g -std=c++14 -O0 `sdl2-config --cflags` -I"../include/" -Imls-unit-test
+CXXFLAGS=-g -std=c++17 -O0 `sdl2-config --cflags` -I"../include/" -Imls-unit-test
 CXXFLAGS+= -MMD -MF $*.d # For calculating dependencies
 TESTS=${OBJECTS:.o= }
 
 LINKFLAGS=${FLAGS} ../matgui-sdl.a ${LIBS} 
 
 all: ${TESTS}
 
-%-test: %-test.o ../matgui-sdl.a
+main.o: mls-unit-test/test_main.cpp
+	${CXX} -o $@ $< ${CXXFLAGS}
+
+%-test: %-test.o ../matgui-sdl.a main.o
 	@echo "test" $<
-	${CXX} -o $@ $< ${LINKFLAGS}
+	${CXX} -o $@ $< main.o ${LINKFLAGS} -std=c++17
 
 -include *.d
 

tests/signal-test.cpp

@@ -5,11 +5,10 @@
  *      Author: Mattias Larsson Sköld
  */
 
-//#define DO_NOT_CATCH_ERRORS
+// #define DO_NOT_CATCH_ERRORS
 
 #include "matgui/matsig.h"
 #include "mls-unit-test/unittest.h"
-#include <thread>
 
 using namespace MatSig;
 using namespace std;
@@ -53,7 +52,7 @@ static void globalArgumentFunction(int i) {
     functionIsCalled = true;
 }
 
-TEST_SUIT_BEGIN
+TEST_SUIT_BEGIN(MatguiSignal)
 
 TEST_CASE("void signal callback") {
     Signal<void> signal;
@@ -136,6 +135,7 @@ TEST_CASE("lambda void argument function") {
     flushSignals();
 
     ASSERT(isCalled, "the function not called");
+
     ASSERT_EQ(y, 5);
 
     isCalled = false;