Skip to content

Commit ee49ca0

Browse files
authored
Merge pull request #177 from saxbophone/develop
v0.27 - Measure CPU Time not Wall Clock Time
2 parents ec94969 + b0b9c37 commit ee49ca0

File tree

82 files changed

+375
-166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+375
-166
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,8 @@ Makefile
4242
cmake_install.cmake
4343
CTestTestfile.cmake
4444
install_manifest.txt
45+
46+
# CMake build directory
47+
build/*
48+
# explicitly allow build directory .gitkeep file
49+
!build/.gitkeep

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# begin basic metadata
1616
cmake_minimum_required(VERSION 3.0)
1717

18-
project(sxbp VERSION 0.26.1 LANGUAGES C)
18+
project(sxbp VERSION 0.27.0 LANGUAGES C)
1919

2020
# set default C standard to use (C99) if not already set
2121
if(NOT DEFINED LIBSXBP_C_STANDARD)

Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = libsxbp
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = v0.26
41+
PROJECT_NUMBER = v0.27
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,12 @@ There are no compulsory library dependencies beyond the C99 standard library. *Y
6060
6161
### Recommended Library Build
6262

63-
Invoke CMake within the root of this repository, with these arguments to make CMake build the library in release mode (with full optimisation) and as a shared library:
63+
> An **out of source build** is recommended, as CMake clutters the directory it is executed in with many files which are awkward to remove.
64+
65+
Invoke CMake within the `build` directory of this repository, with these arguments to make CMake build the library in release mode (with full optimisation) and as a shared library:
6466

6567
```sh
66-
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON .
68+
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON ..
6769
make
6870
```
6971

@@ -73,12 +75,12 @@ You can build in C11 mode if you want with either of the following:
7375

7476
```sh
7577
# using CMake variable
76-
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DLIBSXBP_C_STANDARD=11 .
78+
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DLIBSXBP_C_STANDARD=11 ..
7779
```
7880

7981
```sh
8082
# using environment variable
81-
LIBSXBP_C_STANDARD=11 cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON .
83+
LIBSXBP_C_STANDARD=11 cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON ..
8284
```
8385

8486
Also, by default the CMake build script will look for libpng. If it cannot find it then it will disable support for PNG output.
@@ -87,12 +89,12 @@ You may choose to explicitly disable or enable PNG support with the `LIBSXBP_PNG
8789

8890
```sh
8991
# PNG support is required, build will fail if libpng can't be found
90-
cmake -DLIBSXBP_PNG_SUPPORT=ON .
92+
cmake -DLIBSXBP_PNG_SUPPORT=ON ..
9193
```
9294

9395
```sh
9496
# PNG support is not included, even if libpng can be found
95-
cmake -DLIBSXBP_PNG_SUPPORT=OFF .
97+
cmake -DLIBSXBP_PNG_SUPPORT=OFF ..
9698
```
9799

98100
> ### Note:

build/.gitkeep

Whitespace-only changes.

docs/annotated.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<td id="projectlogo"><img alt="Logo" src="libsxbp.png"/></td>
2626
<td id="projectalign" style="padding-left: 0.5em;">
2727
<div id="projectname">libsxbp
28-
&#160;<span id="projectnumber">v0.26</span>
28+
&#160;<span id="projectnumber">v0.27</span>
2929
</div>
3030
<div id="projectbrief">Experimental generation of 2D spiralling lines based on input binary data.</div>
3131
</td>

docs/backend__pbm_8h.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<td id="projectlogo"><img alt="Logo" src="libsxbp.png"/></td>
2626
<td id="projectalign" style="padding-left: 0.5em;">
2727
<div id="projectname">libsxbp
28-
&#160;<span id="projectnumber">v0.26</span>
28+
&#160;<span id="projectnumber">v0.27</span>
2929
</div>
3030
<div id="projectbrief">Experimental generation of 2D spiralling lines based on input binary data.</div>
3131
</td>
@@ -104,8 +104,8 @@
104104
<div class="dyncontent">
105105
<div class="center"><img src="backend__pbm_8h__incl.png" border="0" usemap="#sxbp_2render__backends_2backend__pbm_8h" alt=""/></div>
106106
<map name="sxbp_2render__backends_2backend__pbm_8h" id="sxbp_2render__backends_2backend__pbm_8h">
107-
<area shape="rect" id="node2" href="saxbospiral_8h.html" title="This compilation unit provides most of the data types used by the library, as well as defining some l..." alt="" coords="27,169,138,196"/>
108-
<area shape="rect" id="node6" href="render_8h.html" title="This compilation unit provides functions for rendering a spiral to a bitmap. " alt="" coords="131,95,213,121"/>
107+
<area shape="rect" id="node2" href="saxbospiral_8h.html" title="This compilation unit provides most of the data types used by the library, as well as defining some l..." alt="" coords="78,169,189,196"/>
108+
<area shape="rect" id="node7" href="render_8h.html" title="This compilation unit provides functions for rendering a spiral to a bitmap. " alt="" coords="182,95,263,121"/>
109109
</map>
110110
</div>
111111
</div>

docs/backend__pbm_8h__incl.map

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<map id="sxbp/render_backends/backend_pbm.h" name="sxbp/render_backends/backend_pbm.h">
2-
<area shape="rect" id="node2" href="$saxbospiral_8h.html" title="This compilation unit provides most of the data types used by the library, as well as defining some l..." alt="" coords="27,169,138,196"/>
3-
<area shape="rect" id="node6" href="$render_8h.html" title="This compilation unit provides functions for rendering a spiral to a bitmap. " alt="" coords="131,95,213,121"/>
2+
<area shape="rect" id="node2" href="$saxbospiral_8h.html" title="This compilation unit provides most of the data types used by the library, as well as defining some l..." alt="" coords="78,169,189,196"/>
3+
<area shape="rect" id="node7" href="$render_8h.html" title="This compilation unit provides functions for rendering a spiral to a bitmap. " alt="" coords="182,95,263,121"/>
44
</map>

docs/backend__pbm_8h__incl.md5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3dfb6ae624b8e29e3b0371a593b57e64
1+
ae0da03ff880d26982d479c9613fcf06

docs/backend__pbm_8h__incl.png

1.32 KB
Loading

0 commit comments

Comments
 (0)