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`)
This commit is contained in:
committed by
GitHub
parent
7856827ecf
commit
c87200a80d
@@ -1,11 +1,11 @@
|
||||
#include "LvglTask.h"
|
||||
|
||||
#include "lvgl.h"
|
||||
#include "Log.h"
|
||||
#include "Thread.h"
|
||||
#include "lvgl/LvglSync.h"
|
||||
#include <Tactility/Log.h>
|
||||
#include <Tactility/lvgl/LvglSync.h>
|
||||
#include <Tactility/Mutex.h>
|
||||
#include <Tactility/Thread.h>
|
||||
|
||||
#include "Mutex.h"
|
||||
#include <lvgl.h>
|
||||
|
||||
#define TAG "lvgl_task"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "Main.h"
|
||||
#include "TactilityCore.h"
|
||||
#include "Thread.h"
|
||||
#include <Tactility/TactilityCore.h>
|
||||
#include <Tactility/Thread.h>
|
||||
|
||||
#include "FreeRTOS.h"
|
||||
#include "task.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "hal/Configuration.h"
|
||||
#include "Main.h"
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
|
||||
namespace simulator {
|
||||
/** Set the function pointer of the real app_main() */
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#include "Tactility.h"
|
||||
#include "hal/Configuration.h"
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
#include "hal/SimulatorPower.h"
|
||||
#include "LvglTask.h"
|
||||
#include "src/lv_init.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "SdlTouch.h"
|
||||
#include "hal/Display.h"
|
||||
#include <Tactility/hal/Display.h>
|
||||
|
||||
extern lv_disp_t* displayHandle;
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "hal/Keyboard.h"
|
||||
|
||||
#include <TactilityCore.h>
|
||||
#include <Tactility/hal/Keyboard.h>
|
||||
#include <Tactility/TactilityCore.h>
|
||||
|
||||
class SdlKeyboard : public tt::hal::Keyboard {
|
||||
private:
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "hal/Touch.h"
|
||||
|
||||
#include <TactilityCore.h>
|
||||
#include <Tactility/hal/Touch.h>
|
||||
#include <Tactility/TactilityCore.h>
|
||||
|
||||
class SdlTouch : public tt::hal::Touch {
|
||||
private:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "hal/Power.h"
|
||||
#include <Tactility/hal/Power.h>
|
||||
#include <memory>
|
||||
|
||||
using namespace tt::hal;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "hal/SdCard.h"
|
||||
#include <Tactility/hal/SdCard.h>
|
||||
|
||||
using namespace tt::hal;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user