From 3a7989fb2eac7bb4c0e594325caaa66298b9b1a6 Mon Sep 17 00:00:00 2001 From: Baptiste Wicht Date: Wed, 17 Aug 2016 22:32:54 +0200 Subject: [PATCH] Move Liberation to tlib --- kernel/src/vesa.cpp | 2 +- programs/odin/src/Liberation.c | 1 - programs/odin/src/main.cpp | 2 +- sonar-project.properties | 1 + kernel/src/Liberation.c => tlib/include/tlib/Liberation.inl | 0 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 120000 programs/odin/src/Liberation.c rename kernel/src/Liberation.c => tlib/include/tlib/Liberation.inl (100%) diff --git a/kernel/src/vesa.cpp b/kernel/src/vesa.cpp index fdb0fd4f..62f61938 100644 --- a/kernel/src/vesa.cpp +++ b/kernel/src/vesa.cpp @@ -35,7 +35,7 @@ size_t red_shift; size_t blue_shift; size_t green_shift; -#include "Liberation.c" +#include } //end of anonymous namespace diff --git a/programs/odin/src/Liberation.c b/programs/odin/src/Liberation.c deleted file mode 120000 index c72bb4f8..00000000 --- a/programs/odin/src/Liberation.c +++ /dev/null @@ -1 +0,0 @@ -../../../kernel/src/Liberation.c \ No newline at end of file diff --git a/programs/odin/src/main.cpp b/programs/odin/src/main.cpp index 7d751757..fa599fa3 100644 --- a/programs/odin/src/main.cpp +++ b/programs/odin/src/main.cpp @@ -23,7 +23,7 @@ uint64_t red_shift = 0; uint64_t green_shift = 0; uint64_t blue_shift = 0; -#include "Liberation.c" +#include uint32_t make_color(uint8_t r, uint8_t g, uint8_t b){ return (r << red_shift) + (g << green_shift) + (b << blue_shift); diff --git a/sonar-project.properties b/sonar-project.properties index 16ca31b1..e66f5ecb 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,6 +2,7 @@ sonar.projectKey=thor sonar.projectName=thor sonar.projectVersion=1.2.3 +sonar.cxx.suffixes.headers=.hpp,.inl sonar.sources=programs,tlib,tstl,kernel/include,kernel/src,init sonar.language=c++ diff --git a/kernel/src/Liberation.c b/tlib/include/tlib/Liberation.inl similarity index 100% rename from kernel/src/Liberation.c rename to tlib/include/tlib/Liberation.inl