include/main.h

@@ -4,6 +4,10 @@
 #include <iostream>
 #include <cstdint>
 
+#ifndef __TEST_RUNNER__
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#endif // __TEST_RUNNER__
+
 
 enum GenerationMethod
 {

makefile

@@ -28,8 +28,11 @@ INC_DIR = include
 
 # Object files directory
 BUILD_DIR = build
+TEST_BUILD_DIR = testBuilds
 
-# Test directory
+# Test Variables
+TEST_FLAG = __TEST_RUNNER__
+TEST_TARGET = $(BIN_DIR)/test_runner
 TEST_DIR = test
 
 # Executable directory
@@ -49,23 +52,21 @@ TEST_FILES = $(wildcard $(TEST_DIR)/**/*.test.cpp $(TEST_DIR)/*.test.cpp)
 
 # Object files
 OBJ_FILES = $(patsubst $(SRC_DIR)/%.cpp,$(BUILD_DIR)/%.o,$(SRC_FILES))
-TEST_OBJ_FILES = $(patsubst $(TEST_DIR)/%.test.cpp,$(BUILD_DIR)/%.o,$(TEST_FILES))
+TEST_OBJ_FILES = $(patsubst $(TEST_DIR)/%.test.cpp,$(TEST_BUILD_DIR)/%.test.o,$(TEST_FILES)) $(patsubst $(SRS_DIR)/%.cpp,$(TEST_BUILD_DIR)/%.o,$(TEST_FILES))
 
 # Define this for running console-only
 CONSOLE_DEFINE = -Dconsole
 
 # Output executable
 TARGET = $(BIN_DIR)/game
-TEST_TARGET = $(BIN_DIR)/test_runner
 
 all: $(TARGET)
 
+test: $(TEST_TARGET)
+
 $(TARGET): $(OBJ_FILES)
 	$(CXX) $(CXXFLAGS) -o $(TARGET) $(OBJ_FILES) $(SDL_LIBRARY) $(SDL_OPTIONS)
 
-console: $(OBJ_FILES)
-	$(CXX) $(CXXFLAGS) -o $(TARGET) $(OBJ_FILES) $(CONSOLE_DEFINE)
-
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.cpp ${INC_DIR}/*.h
 	@mkdir -p $(@D)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -I$(INC_DIR) -c -o $@ $<
@@ -75,9 +76,5 @@ clean:
 	rm -rf ./*~ ./*.swp
 	rm -rf *~
 
-unitTests:
-
-test: unitTests
-
 run: $(TARGET)
 	./$(TARGET)

src/main.cpp

 #include "main.h"
 
+#ifndef __TEST_RUNNER__
 
 int main( int argc, char* argv[] ) {
 	const uint16_t SCREEN_HEIGHT = 600;
@@ -59,3 +60,5 @@ int main( int argc, char* argv[] ) {
 	return 0;
 }
 // int /*WINAPI*/ WinMain(/*HINSTANCE hInstance, HINSTANCE, LPSTR, int*/) { main(); return 0; }
+
+#endif // __TEST_RUNNER__

tests/maths/vec2.test.cpp

+#include <iostream>
+#include "doctest.h"
+
+std::cout << "Test" << std::endl;