now links

remembre to add extern "C" when including pure C files!!!!!
This commit is contained in:
Emanuele Trabattoni
2021-05-16 16:22:06 +02:00
parent 4e0308b0b0
commit e39d0b4c75
8 changed files with 52 additions and 29 deletions

View File

@@ -10,5 +10,7 @@ set(CMAKE_CXX_STANDARD 17)
# Initialize the SDK
pico_sdk_init()
add_subdirectory(src)
add_subdirectory(include)
add_subdirectory(libs)
add_subdirectory(src)

3
include/CMakeLists.txt Normal file
View File

@@ -0,0 +1,3 @@
aux_source_directory(. DIR_Include_SRCS)
add_library(MyLibs ${DIR_Include_SRCS})

8
include/myclass.cpp Normal file
View File

@@ -0,0 +1,8 @@
#include "myclass.h"
Myclass::Myclass(int a):
_a(a)
{
return;
};

10
include/myclass.h Normal file
View File

@@ -0,0 +1,10 @@
class Myclass {
public:
Myclass(int a);
public:
void culo() {};
private:
int _a;
};

View File

@@ -1 +1,5 @@
add_subdirectory(epaper)
#include e-Paper subdirectories
add_subdirectory(epaper/Config)
add_subdirectory(epaper/e-Paper)
add_subdirectory(epaper/Fonts)
add_subdirectory(epaper/GUI)

View File

@@ -1,11 +0,0 @@
# add a compilation subdirectory
add_subdirectory(Config)
add_subdirectory(e-Paper)
add_subdirectory(Fonts)
add_subdirectory(GUI)
# add a header directory
include_directories(Config)
include_directories(e-Paper)
include_directories(Fonts)
include_directories(GUI)

View File

@@ -1,4 +1,5 @@
# add a header directory
include_directories(../include)
include_directories(../libs/epaper/Config)
include_directories(../libs/epaper/e-Paper)
include_directories(../libs/epaper/GUI)
@@ -7,19 +8,20 @@ include_directories(../libs/epaper/Fonts)
#add executable for main
add_executable(emon main.cpp)
# Pull in our pico_stdlib which aggregates commonly used features
target_link_libraries(emon
hardware_spi
pico_stdlib
ePaper
GUI
Fonts
Config
)
# enable usb output, disable uart output
pico_enable_stdio_usb(emon 1)
pico_enable_stdio_uart(emon 0)
# create map/bin/hex/uf2 file etc.
pico_add_extra_outputs(emon)
# Pull in our pico_stdlib which aggregates commonly used features
target_link_libraries(emon
hardware_spi
pico_stdlib
Config
ePaper
GUI
Fonts
MyLibs
)

View File

@@ -1,9 +1,12 @@
#include <stdio.h>
#include <pico/stdlib.h>
#include <DEV_Config.h>
#include <GUI_Paint.h>
#include <EPD_2in9b_V3.h>
// Ricrdarsi di inserire cosi' tutte le lebrerie C altrimenti non LINKA, vaccamiseria
extern "C" {
#include <EPD_2in9d.h>
}
#include <myclass.h>
int main(){
stdio_init_all();
@@ -13,8 +16,10 @@ int main(){
bool s=false;
uint32_t i=0;
EPD_2IN9B_V3_Init();
auto a(Myclass(3));
a.culo();
EPD_2IN9D_Init();
while (true) {
printf("[%u] Hello, world!\n",i++);