diff --git a/.vscode/settings.json b/.vscode/settings.json index a0bd724..29964a0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,6 +10,8 @@ "stdlib.h": "c", "poll.h": "c", "sdl.h": "c", - "myfeatures.h": "c" + "myfeatures.h": "c", + "freemonobold.h": "c", + "sdl_image.h": "c" } } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 26d187e..df4c44d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,4 +2,4 @@ cmake_minimum_required(VERSION 3.7) project(TLangInterperter) add_subdirectory(libtlang) -add_subdirectory(tlang) \ No newline at end of file +add_subdirectory(tlang) diff --git a/libtlang/include/myfeatures.h b/libtlang/include/myfeatures.h index 86a9003..f80e099 100644 --- a/libtlang/include/myfeatures.h +++ b/libtlang/include/myfeatures.h @@ -1,8 +1,12 @@ +#if defined(GEKKO) +#define USE_GRRLIB +#else #define USE_SDL2 +#endif #define USE_NETWORK #define USE_WIISOCKETS_ON_WII //comment out for #include #define USE_THREADS #define USE_MBED #define USE_CURL #define USE_JANSSON -#define USE_GTK +//#define USE_GTK diff --git a/libtlang/src/sdl2.c b/libtlang/src/sdl2.c index 84c5783..0dba43d 100644 --- a/libtlang/src/sdl2.c +++ b/libtlang/src/sdl2.c @@ -1,13 +1,8 @@ -#if defined(GEKKO) -#include -#include -#include -#else +#if defined(USE_SDL2) #include #include #include -#endif #include "tlang.h" #include "FreeMonoBold.h" @@ -797,3 +792,4 @@ dict_setkvp(_sdl->data.dict,kvp_WINDOWPOS_CENTERED); rt->globals->setvariable(rt->globals,"sdl",_sdl); } +#endif