From 017ec45e94204f977dcd7b04c8035d48f230ded3 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sun, 31 Dec 2017 05:24:40 +0100 Subject: Sibs can now build itself on windows Fixed several bugs. The windows implementation IS QUICK AND DIRTY! It links things as static even if you wish to link as dynamic etc..... NEED TO FIX THIS !!! --- tests/project.conf | 2 +- tests/src/confTest/confTest.cpp | 6 +++--- tests/src/main.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/project.conf b/tests/project.conf index 6a33314..0f33088 100644 --- a/tests/project.conf +++ b/tests/project.conf @@ -1,2 +1,2 @@ [dependencies] -catch2 = "0.1.0" +catch2 = "2.0.1" \ No newline at end of file diff --git a/tests/src/confTest/confTest.cpp b/tests/src/confTest/confTest.cpp index eaf5c0b..e1b5b7a 100644 --- a/tests/src/confTest/confTest.cpp +++ b/tests/src/confTest/confTest.cpp @@ -1,12 +1,12 @@ -#include "catch2/0.1.0/catch.hpp" +#include "catch2/2.0.1/catch.hpp" #include "../../../include/Conf.hpp" using namespace sibs; TEST_CASE("parse config") { - SibsConfig sibsConfig(Compiler::GCC, "tests/src/confTest"); - Result result = Config::readFromFile("tests/src/confTest/project.conf", sibsConfig); + SibsConfig sibsConfig(Compiler::GCC, TINYDIR_STRING("tests/src/confTest")); + Result result = Config::readFromFile(TINYDIR_STRING("tests/src/confTest/project.conf"), sibsConfig); if(result.isErr()) { fprintf(stderr, "%s", result.getErrMsg().c_str()); diff --git a/tests/src/main.cpp b/tests/src/main.cpp index d29d915..50ecd8b 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -1,2 +1,2 @@ #define CATCH_CONFIG_MAIN -#include "catch2/0.1.0/catch.hpp" +#include "catch2/2.0.1/catch.hpp" -- cgit v1.2.3