Commit 5a224ff0 by Marcus Winter

Merge branch 'development' of https://github.com/siemens/embb into development

parents 9ba195cf d240734c
...@@ -75,7 +75,7 @@ This project is based on the standards C99 (for C code) and C++03 (for C++ ...@@ -75,7 +75,7 @@ This project is based on the standards C99 (for C code) and C++03 (for C++
code) to be usable on a wide range of target systems. It has been tested on code) to be usable on a wide range of target systems. It has been tested on
the following OS/compiler/architecture combinations: the following OS/compiler/architecture combinations:
- Linux (Ubuntu 12.10) / GCC 4.8.1 / x86, x86_64 - Linux (Ubuntu 12.04) / GCC 4.8.1 / x86, x86_64
- Linux (Ubuntu 12.04) / Clang 3.0.0 / x86_64 - Linux (Ubuntu 12.04) / Clang 3.0.0 / x86_64
- Linux (Ubuntu 14.04) / GCC 4.8.2 / ARMv7 - Linux (Ubuntu 14.04) / GCC 4.8.2 / ARMv7
- Windows - Windows
...@@ -154,7 +154,8 @@ the default (Release) is used. The Visual Studio generators create build files ...@@ -154,7 +154,8 @@ the default (Release) is used. The Visual Studio generators create build files
for both modes (the selection is done at build time). for both modes (the selection is done at build time).
You may choose a custom compiler instead the default one by defining You may choose a custom compiler instead the default one by defining
CMAKE_CXX_COMPILER and/or CMAKE_C_COMPILER. E.g. to use clang on Linux use: CMAKE_CXX_COMPILER and/or CMAKE_C_COMPILER. For example, to use Clang on Linux
use:
cmake .. -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang cmake .. -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
......
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
% 1st paramter: a square(!) picture % 1st paramter: a square(!) picture
% 2nd parameter: short tile (one line) % 2nd parameter: short tile (one line)
% 3rd parameter: long title (up to two lines) % 3rd parameter: long title (up to two lines)
\gentitlepage{pics/chicago-square.jpg}{\LARGE Siemens Corporate Technology | \monthword{\month} 2014}{\scalebox{0.9}{Embedded Multicore Building Blocks}\\\scalebox{0.9}{Introduction and Tutorial}} \gentitlepage{pics/chicago-square.jpg}{\LARGE Siemens Corporate Technology | \monthword{\month} 2015}{\scalebox{0.9}{Embedded Multicore Building Blocks}\\\scalebox{0.9}{Introduction and Tutorial}}
% List the authors and contributors on the second page, right after the cover page % List the authors and contributors on the second page, right after the cover page
% 1st parameter: contributors (optional) % 1st parameter: contributors (optional)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment