From 8fda4071834ccecc7c07b95780a7500fd66b0c51 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sat, 10 Mar 2018 19:24:20 -0500 Subject: [PATCH] Moved the old drawtext example out of the way. --- .../examples_drawtext}/attributes.c | 0 .../examples_drawtext}/basic.c | 0 .../examples_drawtext}/drawtext.h | 0 .../examples_drawtext}/emptystr_hittest.c | 0 .../examples_drawtext}/hittest.c | 0 .../examples_drawtext}/httext.gz | Bin .../examples_drawtext}/main.c | 0 _wip/examples_drawtext_CMakeLists.txt | 58 ++++++++++++++++++ examples/CMakeLists.txt | 11 ---- 9 files changed, 58 insertions(+), 11 deletions(-) rename {examples/drawtext => _wip/examples_drawtext}/attributes.c (100%) rename {examples/drawtext => _wip/examples_drawtext}/basic.c (100%) rename {examples/drawtext => _wip/examples_drawtext}/drawtext.h (100%) rename {examples/drawtext => _wip/examples_drawtext}/emptystr_hittest.c (100%) rename {examples/drawtext => _wip/examples_drawtext}/hittest.c (100%) rename {examples/drawtext => _wip/examples_drawtext}/httext.gz (100%) rename {examples/drawtext => _wip/examples_drawtext}/main.c (100%) create mode 100644 _wip/examples_drawtext_CMakeLists.txt diff --git a/examples/drawtext/attributes.c b/_wip/examples_drawtext/attributes.c similarity index 100% rename from examples/drawtext/attributes.c rename to _wip/examples_drawtext/attributes.c diff --git a/examples/drawtext/basic.c b/_wip/examples_drawtext/basic.c similarity index 100% rename from examples/drawtext/basic.c rename to _wip/examples_drawtext/basic.c diff --git a/examples/drawtext/drawtext.h b/_wip/examples_drawtext/drawtext.h similarity index 100% rename from examples/drawtext/drawtext.h rename to _wip/examples_drawtext/drawtext.h diff --git a/examples/drawtext/emptystr_hittest.c b/_wip/examples_drawtext/emptystr_hittest.c similarity index 100% rename from examples/drawtext/emptystr_hittest.c rename to _wip/examples_drawtext/emptystr_hittest.c diff --git a/examples/drawtext/hittest.c b/_wip/examples_drawtext/hittest.c similarity index 100% rename from examples/drawtext/hittest.c rename to _wip/examples_drawtext/hittest.c diff --git a/examples/drawtext/httext.gz b/_wip/examples_drawtext/httext.gz similarity index 100% rename from examples/drawtext/httext.gz rename to _wip/examples_drawtext/httext.gz diff --git a/examples/drawtext/main.c b/_wip/examples_drawtext/main.c similarity index 100% rename from examples/drawtext/main.c rename to _wip/examples_drawtext/main.c diff --git a/_wip/examples_drawtext_CMakeLists.txt b/_wip/examples_drawtext_CMakeLists.txt new file mode 100644 index 00000000..f2289d21 --- /dev/null +++ b/_wip/examples_drawtext_CMakeLists.txt @@ -0,0 +1,58 @@ +# 3 june 2016 + +if(WIN32) + set(_EXAMPLE_RESOURCES_RC resources.rc) +endif() + +macro(_add_example _name) + _add_exec(${_name} ${ARGN}) + # because Microsoft's toolchain is dumb + if(MSVC) + set_property(TARGET ${_name} APPEND_STRING PROPERTY + LINK_FLAGS " /ENTRY:mainCRTStartup") + endif() +endmacro() + +_add_example(controlgallery + controlgallery/main.c + ${_EXAMPLE_RESOURCES_RC} +) + +_add_example(histogram + histogram/main.c + ${_EXAMPLE_RESOURCES_RC} +) + +_add_example(cpp-multithread + cpp-multithread/main.cpp + ${_EXAMPLE_RESOURCES_RC} +) +if(NOT WIN32) + target_link_libraries(cpp-multithread pthread) +endif() + +_add_example(drawtext + drawtext/attributes.c + drawtext/basic.c + drawtext/emptystr_hittest.c + drawtext/hittest.c + drawtext/main.c + ${_EXAMPLE_RESOURCES_RC} +) +target_include_directories(drawtext + PRIVATE drawtext) + +_add_example(opentype + opentype/main.c + ${_EXAMPLE_RESOURCES_RC} +) +target_include_directories(opentype + PRIVATE opentype) + +add_custom_target(examples + DEPENDS + controlgallery + histogram + cpp-multithread + drawtext + opentype) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index f2289d21..b820df8b 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -31,17 +31,6 @@ if(NOT WIN32) target_link_libraries(cpp-multithread pthread) endif() -_add_example(drawtext - drawtext/attributes.c - drawtext/basic.c - drawtext/emptystr_hittest.c - drawtext/hittest.c - drawtext/main.c - ${_EXAMPLE_RESOURCES_RC} -) -target_include_directories(drawtext - PRIVATE drawtext) - _add_example(opentype opentype/main.c ${_EXAMPLE_RESOURCES_RC}