Project restructuring (fixes macOS builds) (#198)

- Create `Include/` folder for all main projects
- Fix some issues here and there (found while moving things)
- All includes are now in `Tactility/` subfolder and must be included with that prefix. This fixes issues with clashing POSIX headers (e.g. `<semaphore.h>` versus Tactility's `Semaphore.h`)

TactilityC/CMakeLists.txt

@@ -8,29 +8,25 @@ if (DEFINED ENV{ESP_IDF_VERSION})
 
     idf_component_register(
         SRCS ${SOURCE_FILES}
-        INCLUDE_DIRS "Source/"
+        INCLUDE_DIRS "Include/"
         REQUIRES lvgl
         PRIV_REQUIRES Tactility TactilityCore TactilityHeadless elf_loader
     )
 
-    add_definitions(-DESP_PLATFORM)
-
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-unused-variable)
     endif()
 else()
     file(GLOB_RECURSE SOURCES "Source/*.c**")
-    file(GLOB_RECURSE HEADERS "Source/*.h**")
 
     add_library(TactilityC OBJECT)
 
     target_sources(TactilityC
         PRIVATE ${SOURCES}
-        PUBLIC ${HEADERS}
     )
 
     target_include_directories(TactilityC
-        PUBLIC Source/
+        PUBLIC Include/
     )
 
     add_definitions(-D_Nullable=)

TactilityC/Source/tt_app.cpp

@@ -1,6 +1,6 @@
 #include "tt_app.h"
-#include <app/App.h>
-#include <app/AppContext.h>
+#include <Tactility/app/App.h>
+#include <Tactility/app/AppContext.h>
 
 extern "C" {
 

TactilityC/Source/tt_app_alertdialog.cpp

@@ -1,5 +1,5 @@
 #include "tt_app_alertdialog.h"
-#include <app/alertdialog/AlertDialog.h>
+#include <Tactility/app/alertdialog/AlertDialog.h>
 
 extern "C" {
 

TactilityC/Source/tt_app_manifest.cpp

@@ -1,7 +1,7 @@
 #include "tt_app_manifest.h"
 
-#include <Check.h>
-#include <app/ElfApp.h>
+#include <Tactility/Check.h>
+#include <Tactility/app/ElfApp.h>
 
 #define TAG "tt_app"
 

TactilityC/Source/tt_app_selectiondialog.cpp

@@ -1,5 +1,5 @@
 #include "tt_app_selectiondialog.h"
-#include <app/selectiondialog/SelectionDialog.h>
+#include <Tactility/app/selectiondialog/SelectionDialog.h>
 
 extern "C" {
 

TactilityC/Source/tt_bundle.cpp

@@ -1,6 +1,6 @@
-#include <cstring>
 #include "tt_bundle.h"
-#include "Bundle.h"
+#include <Tactility/Bundle.h>
+#include <cstring>
 
 #define HANDLE_AS_BUNDLE(handle) ((tt::Bundle*)(handle))
 

TactilityC/Source/tt_hal_i2c.cpp

@@ -1,5 +1,5 @@
 #include "tt_hal_i2c.h"
-#include "hal/i2c/I2c.h"
+#include <Tactility/hal/i2c/I2c.h>
 
 extern "C" {
 

TactilityC/Source/tt_lvgl_spinner.cpp

@@ -1,5 +1,5 @@
 #include "tt_lvgl_spinner.h"
-#include "lvgl/Spinner.h"
+#include <Tactility/lvgl/Spinner.h>
 
 extern "C" {
 

TactilityC/Source/tt_lvgl_toolbar.cpp

@@ -1,5 +1,5 @@
 #include "tt_lvgl_toolbar.h"
-#include <lvgl/Toolbar.h>
+#include <Tactility/lvgl/Toolbar.h>
 
 extern "C" {
 

TactilityC/Source/tt_message_queue.cpp

@@ -1,5 +1,5 @@
 #include "tt_message_queue.h"
-#include <MessageQueue.h>
+#include <Tactility/MessageQueue.h>
 
 #define HANDLE_TO_MESSAGE_QUEUE(handle) ((tt::MessageQueue*)(handle))
 

TactilityC/Source/tt_mutex.cpp

@@ -1,5 +1,5 @@
 #include "tt_mutex.h"
-#include "Mutex.h"
+#include <Tactility/Mutex.h>
 
 extern "C" {
 

TactilityC/Source/tt_semaphore.cpp

@@ -1,5 +1,5 @@
 #include "tt_semaphore.h"
-#include "Semaphore.h"
+#include <Tactility/Semaphore.h>
 
 extern "C" {
 

TactilityC/Source/tt_service_loader.cpp

@@ -1,6 +1,6 @@
 #include "tt_service_loader.h"
-#include <Bundle.h>
-#include <service/loader/Loader.h>
+#include <Tactility/Bundle.h>
+#include <Tactility/service/loader/Loader.h>
 
 extern "C" {
 

TactilityC/Source/tt_thread.cpp

@@ -1,5 +1,5 @@
 #include "tt_thread.h"
-#include <Thread.h>
+#include <Tactility/Thread.h>
 
 extern "C" {
 

TactilityC/Source/tt_timer.cpp

@@ -1,5 +1,5 @@
 #include "tt_timer.h"
-#include <Timer.h>
+#include <Tactility/Timer.h>
 
 struct TimerWrapper {
     std::unique_ptr<tt::Timer> timer;