Bitmaps: move bitmap defs to bitmaps library

The bitmap definitions (BITMAP_DEF and so on) do not have any dependencies on other libs, including WX. This means the bitmaps library can be isolated from the other dependencies. Common now depends on bitmaps, and libraries that depend on common can pick it up from the common target_link_libraries, as it is PUBLIC. This means a lot of targets no longer need manual bitmap linkage. This avoids a circular dependency that was previously reported by static analysis. Avoiding pulling in WX and other headers into the include tree of each bitmap .cpp is a huge speed up (around 10x) in compilation, and the generated static library is also 10x smaller (20MB vs 200MB) Add common as a link library to pnsrouter,connectivity. THese library do still use common code (including bitmaps, via base_screen.h) and this allows them to pick up the libcommon includes correctly.
7 years ago · bb2ae8e13b
555 changed files with 1170 additions and 1141 deletions
--- a/CMakeModules/PNG2cpp.cmake
+++ b/CMakeModules/PNG2cpp.cmake
@ -47,7 +47,7 @@ set( output_begin "
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {"
 )
--- a/bitmap2component/CMakeLists.txt
+++ b/bitmap2component/CMakeLists.txt
@ -50,7 +50,6 @@ add_executable( bitmap2component WIN32 MACOSX_BUNDLE
 target_link_libraries( bitmap2component
    common
    polygon
-    bitmaps
    gal
    ${wxWidgets_LIBRARIES}
    potrace
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@ -55,14 +55,6 @@ option( MAINTAIN_PNGS
 # Used Only to maintain PNG files (and therefore to recreate .cpp files)
 # The png2cpp creates files with native End of Line format.

-include_directories(BEFORE ${INC_BEFORE})
-include_directories(
-    ${INC_AFTER}
-    )
-
-
-
-
 # Plan for three sizes of bitmaps:
 # SMALL - for menus         - 16 x 16
 # MID   - for toolbars      - 26 x 26
@ -794,3 +786,7 @@ endforeach()

 #add_library( bitmaps SHARED ${CPP_LIST} )
 add_library( bitmaps STATIC ${CPP_LIST} )
+
+target_include_directories( bitmaps PUBLIC
+    include
+)
--- a/bitmaps_png/cpp_16/folder.cpp
+++ b/bitmaps_png/cpp_16/folder.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinorient_down.cpp
+++ b/bitmaps_png/cpp_16/pinorient_down.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinorient_left.cpp
+++ b/bitmaps_png/cpp_16/pinorient_left.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinorient_right.cpp
+++ b/bitmaps_png/cpp_16/pinorient_right.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinorient_up.cpp
+++ b/bitmaps_png/cpp_16/pinorient_up.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinshape_active_low_input.cpp
+++ b/bitmaps_png/cpp_16/pinshape_active_low_input.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinshape_active_low_output.cpp
+++ b/bitmaps_png/cpp_16/pinshape_active_low_output.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinshape_clock_active_low.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_active_low.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinshape_clock_fall.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_fall.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinshape_clock_invert.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_invert.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinshape_clock_normal.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_normal.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinshape_invert.cpp
+++ b/bitmaps_png/cpp_16/pinshape_invert.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinshape_nonlogic.cpp
+++ b/bitmaps_png/cpp_16/pinshape_nonlogic.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pinshape_normal.cpp
+++ b/bitmaps_png/cpp_16/pinshape_normal.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pintype_3states.cpp
+++ b/bitmaps_png/cpp_16/pintype_3states.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pintype_bidi.cpp
+++ b/bitmaps_png/cpp_16/pintype_bidi.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pintype_input.cpp
+++ b/bitmaps_png/cpp_16/pintype_input.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pintype_noconnect.cpp
+++ b/bitmaps_png/cpp_16/pintype_noconnect.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pintype_notspecif.cpp
+++ b/bitmaps_png/cpp_16/pintype_notspecif.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pintype_opencoll.cpp
+++ b/bitmaps_png/cpp_16/pintype_opencoll.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pintype_openemit.cpp
+++ b/bitmaps_png/cpp_16/pintype_openemit.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pintype_output.cpp
+++ b/bitmaps_png/cpp_16/pintype_output.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pintype_passive.cpp
+++ b/bitmaps_png/cpp_16/pintype_passive.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pintype_powerinput.cpp
+++ b/bitmaps_png/cpp_16/pintype_powerinput.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/pintype_poweroutput.cpp
+++ b/bitmaps_png/cpp_16/pintype_poweroutput.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/refresh.cpp
+++ b/bitmaps_png/cpp_16/refresh.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/small_down.cpp
+++ b/bitmaps_png/cpp_16/small_down.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/small_edit.cpp
+++ b/bitmaps_png/cpp_16/small_edit.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/small_library.cpp
+++ b/bitmaps_png/cpp_16/small_library.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/small_plus.cpp
+++ b/bitmaps_png/cpp_16/small_plus.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/small_up.cpp
+++ b/bitmaps_png/cpp_16/small_up.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/trash.cpp
+++ b/bitmaps_png/cpp_16/trash.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/tree_nosel.cpp
+++ b/bitmaps_png/cpp_16/tree_nosel.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/tree_sel.cpp
+++ b/bitmaps_png/cpp_16/tree_sel.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_16/www.cpp
+++ b/bitmaps_png/cpp_16/www.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/about.cpp
+++ b/bitmaps_png/cpp_26/about.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_arc.cpp
+++ b/bitmaps_png/cpp_26/add_arc.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_board.cpp
+++ b/bitmaps_png/cpp_26/add_board.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_bus.cpp
+++ b/bitmaps_png/cpp_26/add_bus.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_bus2bus.cpp
+++ b/bitmaps_png/cpp_26/add_bus2bus.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_circle.cpp
+++ b/bitmaps_png/cpp_26/add_circle.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_component.cpp
+++ b/bitmaps_png/cpp_26/add_component.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_corner.cpp
+++ b/bitmaps_png/cpp_26/add_corner.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_dashed_line.cpp
+++ b/bitmaps_png/cpp_26/add_dashed_line.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_dimension.cpp
+++ b/bitmaps_png/cpp_26/add_dimension.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_document.cpp
+++ b/bitmaps_png/cpp_26/add_document.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_gerber.cpp
+++ b/bitmaps_png/cpp_26/add_gerber.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_glabel.cpp
+++ b/bitmaps_png/cpp_26/add_glabel.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_graphical_polygon.cpp
+++ b/bitmaps_png/cpp_26/add_graphical_polygon.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_graphical_segments.cpp
+++ b/bitmaps_png/cpp_26/add_graphical_segments.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_hierar_pin.cpp
+++ b/bitmaps_png/cpp_26/add_hierar_pin.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_hierarchical_label.cpp
+++ b/bitmaps_png/cpp_26/add_hierarchical_label.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp
+++ b/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_junction.cpp
+++ b/bitmaps_png/cpp_26/add_junction.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_keepout_area.cpp
+++ b/bitmaps_png/cpp_26/add_keepout_area.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_library.cpp
+++ b/bitmaps_png/cpp_26/add_library.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_line.cpp
+++ b/bitmaps_png/cpp_26/add_line.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_line2bus.cpp
+++ b/bitmaps_png/cpp_26/add_line2bus.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_line_label.cpp
+++ b/bitmaps_png/cpp_26/add_line_label.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_pcb_target.cpp
+++ b/bitmaps_png/cpp_26/add_pcb_target.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_polygon.cpp
+++ b/bitmaps_png/cpp_26/add_polygon.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_power.cpp
+++ b/bitmaps_png/cpp_26/add_power.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_rectangle.cpp
+++ b/bitmaps_png/cpp_26/add_rectangle.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_tracks.cpp
+++ b/bitmaps_png/cpp_26/add_tracks.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_via.cpp
+++ b/bitmaps_png/cpp_26/add_via.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_zone.cpp
+++ b/bitmaps_png/cpp_26/add_zone.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/add_zone_cutout.cpp
+++ b/bitmaps_png/cpp_26/add_zone_cutout.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/align_items.cpp
+++ b/bitmaps_png/cpp_26/align_items.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/align_items_bottom.cpp
+++ b/bitmaps_png/cpp_26/align_items_bottom.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/align_items_center.cpp
+++ b/bitmaps_png/cpp_26/align_items_center.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/align_items_left.cpp
+++ b/bitmaps_png/cpp_26/align_items_left.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/align_items_middle.cpp
+++ b/bitmaps_png/cpp_26/align_items_middle.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/align_items_right.cpp
+++ b/bitmaps_png/cpp_26/align_items_right.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/align_items_top.cpp
+++ b/bitmaps_png/cpp_26/align_items_top.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/anchor.cpp
+++ b/bitmaps_png/cpp_26/anchor.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/annotate.cpp
+++ b/bitmaps_png/cpp_26/annotate.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/annotate_down_right.cpp
+++ b/bitmaps_png/cpp_26/annotate_down_right.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/annotate_right_down.cpp
+++ b/bitmaps_png/cpp_26/annotate_right_down.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/apply_pad_settings.cpp
+++ b/bitmaps_png/cpp_26/apply_pad_settings.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/array.cpp
+++ b/bitmaps_png/cpp_26/array.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/auto_associe.cpp
+++ b/bitmaps_png/cpp_26/auto_associe.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/auto_delete_track.cpp
+++ b/bitmaps_png/cpp_26/auto_delete_track.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/auto_track_width.cpp
+++ b/bitmaps_png/cpp_26/auto_track_width.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/autoplace_fields.cpp
+++ b/bitmaps_png/cpp_26/autoplace_fields.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/axis3d.cpp
+++ b/bitmaps_png/cpp_26/axis3d.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/axis3d_back.cpp
+++ b/bitmaps_png/cpp_26/axis3d_back.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/axis3d_bottom.cpp
+++ b/bitmaps_png/cpp_26/axis3d_bottom.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/axis3d_front.cpp
+++ b/bitmaps_png/cpp_26/axis3d_front.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/axis3d_left.cpp
+++ b/bitmaps_png/cpp_26/axis3d_left.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/axis3d_right.cpp
+++ b/bitmaps_png/cpp_26/axis3d_right.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/axis3d_top.cpp
+++ b/bitmaps_png/cpp_26/axis3d_top.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/bitmap2component.cpp
+++ b/bitmaps_png/cpp_26/bitmap2component.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/bom.cpp
+++ b/bitmaps_png/cpp_26/bom.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/book.cpp
+++ b/bitmaps_png/cpp_26/book.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/break_bus.cpp
+++ b/bitmaps_png/cpp_26/break_bus.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/break_line.cpp
+++ b/bitmaps_png/cpp_26/break_line.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
--- a/bitmaps_png/cpp_26/browse_files.cpp
+++ b/bitmaps_png/cpp_26/browse_files.cpp
@ -3,7 +3,7 @@
 * PNG2cpp CMake script, using a *.png file as input.
 */

-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>

 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,