From b3bee70aebf1bb6995e49dc33a7951a8db748a96 Mon Sep 17 00:00:00 2001 From: PreacherDHM Date: Wed, 29 Jan 2025 11:24:17 -0800 Subject: [PATCH] fixed testing and includes dir --- source/term.c | 3 ++- testing/CMakeLists.txt | 4 ++-- testing/main.cpp | 9 ++++----- testing/test_tart.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/term.c b/source/term.c index c82e81c..8700c5d 100644 --- a/source/term.c +++ b/source/term.c @@ -19,9 +19,10 @@ struct tart_vec2 term_current_size() { return ret; } -#endif +#else struct tart_vec2 term_current_size() { struct tart_vec2 ret = {50,50}; return ret; } +#endif diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index b31f23a..8a886ae 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -3,10 +3,10 @@ set( CMAKE_CXX_STANDARD 11) set( CMAKE_CXX_STANDARD_REQUIRED ON) set( SOURCES main.cpp - #test_tart.cpp + test_tart.cpp ) add_executable(${PROJECT_NAME} ${SOURCES} ) -target_link_libraries(${PROJECT_NAME} TartLib)# PickleLib) +target_link_libraries(${PROJECT_NAME} TartLib PickleLib) add_test(${PROJECT_NAME} "${CMAKE_SOURCE_DIR}/bin/testing.exe") diff --git a/testing/main.cpp b/testing/main.cpp index b4dc40d..c0de5b5 100644 --- a/testing/main.cpp +++ b/testing/main.cpp @@ -1,8 +1,7 @@ #include "test_tart.h" -//#include +#include int main (int argc, char *argv[]) { -// INSTALLSHELF; - tart_create_cell('t', '1', (struct tart_rgb){0,0,0}, (struct tart_rgb){0,0,0}); - //tart_run(&__pickle_shelf__); - return 0;//PICKLESHELF; + INSTALLSHELF; + tart_run(&__pickle_shelf__); + return PICKLESHELF; } diff --git a/testing/test_tart.h b/testing/test_tart.h index 7dd8e31..dfd1eaa 100644 --- a/testing/test_tart.h +++ b/testing/test_tart.h @@ -1,5 +1,5 @@ #include -//#include +#include bool rgb_test(struct tart_rgb* lhs, struct tart_rgb* rhs); bool vec2_test(struct tart_vec2* lhs, struct tart_vec2* rhs);