bitmap work

18 years ago · 6496680065
79 changed files with 402 additions and 9 deletions
--- a/pcbnew/bitmaps/Add_Mires.xpm
+++ b/pcbnew/bitmaps/Add_Mires.xpm
@ -1,4 +1,7 @@
-/* XPM */ 
+/* XPM */
+#ifndef XPMMAIN
+extern const char* add_mires_xpm[];
+#else
 static const char * add_mires_xpm[] = {
 "16 16 64 1",
 " 	c None",
@ -81,3 +84,5 @@ static const char * add_mires_xpm[] = {
 "       #        ",
 "       #        ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Break_Line.xpm
+++ b/pcbnew/bitmaps/Break_Line.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Break_Line_xpm[];
+#else
 static const char * Break_Line_xpm[] = {
 "16 16 34 1",
 " 	c None",
@ -51,3 +54,5 @@ static const char * Break_Line_xpm[] = {
 "                ",
 "                ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Delete_Line.xpm
+++ b/pcbnew/bitmaps/Delete_Line.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Delete_Line_xpm[];
+#else
 static const char * Delete_Line_xpm[] = {
 "16 16 131 2",
 "  	c None",
@ -148,3 +151,5 @@ static const char * Delete_Line_xpm[] = {
 "    &.*.=.-.;.>.,.'.).-.!.~.    ",
 "    {.].^./.(._.Z :.<.[.}.,.    ",
 "    {.|.1.2.3.4.5.6.7.8.9.0.    "};
+
+#endif
--- a/pcbnew/bitmaps/Delete_Module.xpm
+++ b/pcbnew/bitmaps/Delete_Module.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Delete_Module_xpm[];
+#else
 static const char * Delete_Module_xpm[] = {
 "16 16 129 2",
 "  	c None",
@ -146,3 +149,5 @@ static const char * Delete_Module_xpm[] = {
 "      ..+.@.#.$.%.&.*.=.-.;.>.  ",
 "      ,.'.).!.~.{.].^./.(._.:.  ",
 "      <.[.}.|.1.2.3.4.5.6.7.8.  "};
+
+#endif
--- a/pcbnew/bitmaps/Delete_Net.xpm
+++ b/pcbnew/bitmaps/Delete_Net.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Delete_Net_xpm[];
+#else
 static const char * Delete_Net_xpm[] = {
 "16 16 128 2",
 "  	c None",
@ -145,3 +148,5 @@ static const char * Delete_Net_xpm[] = {
 "       ...+.@.#.$.%.&.*.=.-.;.  ",
 "      >.,.'.).!.~.{.].^./.(._.  ",
 "      :.<.[.}.|.1.2.3.4.5.6.7.  "};
+
+#endif
--- a/pcbnew/bitmaps/Delete_Node.xpm
+++ b/pcbnew/bitmaps/Delete_Node.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Delete_Node_xpm[];
+#else
 static const char * Delete_Node_xpm[] = {
 "16 16 132 2",
 "  	c None",
@ -149,3 +152,5 @@ static const char * Delete_Node_xpm[] = {
 "    #.$.%.&.*.=.-.;.>.,.'.).    ",
 "    !.~.{.].^./.(._.:.<.[.}.    ",
 "    |.1.2.3.4.5.6.7.8.9.0.a.    "};
+
+#endif
--- a/pcbnew/bitmaps/Delete_Pad.xpm
+++ b/pcbnew/bitmaps/Delete_Pad.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Delete_Pad_xpm[];
+#else
 static const char * Delete_Pad_xpm[] = {
 "16 16 120 2",
 "  	c None",
@ -137,3 +140,5 @@ static const char * Delete_Pad_xpm[] = {
 "      T U V W X Y Z `  ...+.@.  ",
 "      #.$.%.&.*.=.-.;.>.,.'.).  ",
 "      !.~.{.].^./.(._.:.<.[.}.  "};
+
+#endif
--- a/pcbnew/bitmaps/Delete_Track.xpm
+++ b/pcbnew/bitmaps/Delete_Track.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Delete_Track_xpm[];
+#else
 static const char * Delete_Track_xpm[] = {
 "16 16 115 2",
 "  	c None",
@ -132,3 +135,5 @@ static const char * Delete_Track_xpm[] = {
 "      O P Q R S T U V W X Y Z   ",
 "      `  ...+.@.#.$.%.&.*.=.-.  ",
 "      ;.>.,.'.).!.~.{.].^./.(.  "};
+
+#endif
--- a/pcbnew/bitmaps/Drag_Module.xpm
+++ b/pcbnew/bitmaps/Drag_Module.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Drag_Module_xpm[];
+#else
 static const char * Drag_Module_xpm[] = {
 "16 16 63 1",
 " 	c None",
@ -80,3 +83,5 @@ static const char * Drag_Module_xpm[] = {
 "       .tuv..   ",
 "        qwx.    ",
 "         .      "};
+
+#endif
--- a/pcbnew/bitmaps/Drag_Outline_Segment.xpm
+++ b/pcbnew/bitmaps/Drag_Outline_Segment.xpm
@ -1,4 +1,7 @@
-/* XPM */ 
+/* XPM */
+#ifndef XPMMAIN
+extern const char* drag_outline_segment_xpm[];
+#else
 static const char * drag_outline_segment_xpm[] = {
 "16 16 40 1",
 " 	c None",
@ -57,3 +60,5 @@ static const char * drag_outline_segment_xpm[] = {
 "       !EFG!!   ",
 "        BHI!    ",
 "         !      "};
+
+#endif
--- a/pcbnew/bitmaps/Drag_Pad.xpm
+++ b/pcbnew/bitmaps/Drag_Pad.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* drag_pad_xpm[];
+#else
 static const char * drag_pad_xpm[] = {
 "16 16 48 1",
 " 	c None",
@ -65,3 +68,5 @@ static const char * drag_pad_xpm[] = {
 "       .efg..   ",
 "        bhi.    ",
 "         .      "};
+
+#endif
--- a/pcbnew/bitmaps/Drag_Segment_WithSlope.xpm
+++ b/pcbnew/bitmaps/Drag_Segment_WithSlope.xpm
@ -1,4 +1,7 @@
-/* XPM */ 
+/* XPM */
+#ifndef XPMMAIN
+extern const char* drag_segment_withslope_xpm[];
+#else
 static const char * drag_segment_withslope_xpm[] = {
 "16 16 40 1",
 " 	c None",
@ -57,3 +60,5 @@ static const char * drag_segment_withslope_xpm[] = {
 "       !EFG!!   ",
 "        BHI!    ",
 "         !      "};
+
+#endif
--- a/pcbnew/bitmaps/Drag_Track_Segment.xpm
+++ b/pcbnew/bitmaps/Drag_Track_Segment.xpm
@ -1,4 +1,7 @@
-/* XPM */ 
+/* XPM */
+#ifndef XPMMAIN
+extern const char* drag_track_segment_xpm[];
+#else
 static const char * drag_track_segment_xpm[] = {
 "16 16 41 1",
 " 	c None",
@ -58,3 +61,5 @@ static const char * drag_track_segment_xpm[] = {
 "       #FGH##   ",
 "        CIJ#    ",
 "         #      "};
+
+#endif
--- a/pcbnew/bitmaps/Edges_Sketch.xpm
+++ b/pcbnew/bitmaps/Edges_Sketch.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Edges_Sketch_xpm[];
+#else
 static const char * Edges_Sketch_xpm[] = {
 "16 16 3 1",
 " 	c None",
@ -20,3 +23,5 @@ static const char * Edges_Sketch_xpm[] = {
 ". .+       +. . ",
 "...+++++++++... ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Edit_Module.xpm
+++ b/pcbnew/bitmaps/Edit_Module.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Edit_Module_xpm[];
+#else
 static const char * Edit_Module_xpm[] = {
 "16 16 48 1",
 " 	c None",
@ -65,3 +68,5 @@ static const char * Edit_Module_xpm[] = {
 "   ......       ",
 "                ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Export_Module.xpm
+++ b/pcbnew/bitmaps/Export_Module.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* export_module_xpm[];
+#else
 static const char * export_module_xpm[] = {
 "16 16 86 1",
 " 	c None",
@ -103,3 +106,5 @@ static const char * export_module_xpm[] = {
 "  ........      ",
 "                ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Export_Options_Pad.xpm
+++ b/pcbnew/bitmaps/Export_Options_Pad.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Export_Options_Pad_xpm[];
+#else
 static const char * Export_Options_Pad_xpm[] = {
 "16 16 71 1",
 " 	c None",
@ -88,3 +91,5 @@ static const char * Export_Options_Pad_xpm[] = {
 "   .dh.qlx.....y",
 "   .dh.zxo.ABCDE",
 "   .dlf...stFFFF"};
+
+#endif
--- a/pcbnew/bitmaps/Flag.xpm
+++ b/pcbnew/bitmaps/Flag.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Flag_xpm[];
+#else
 static const char * Flag_xpm[] = {
 "16 16 24 1",
 " 	c None",
@ -41,3 +44,5 @@ static const char * Flag_xpm[] = {
 "       .....    ",
 "    ..........  ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Global_Options_Pad.xpm
+++ b/pcbnew/bitmaps/Global_Options_Pad.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* global_options_pad_xpm[];
+#else
 static const char * global_options_pad_xpm[] = {
 "16 16 81 1",
 " 	c None",
@ -98,3 +101,5 @@ static const char * global_options_pad_xpm[] = {
 "<fwxyziAg/B7...(",
 "<CDEFGH:c}I.JK3.",
 "LbMNOPA.....K!d."};
+
+#endif
--- a/pcbnew/bitmaps/Import_Module.xpm
+++ b/pcbnew/bitmaps/Import_Module.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* import_module_xpm[];
+#else
 static const char * import_module_xpm[] = {
 "16 16 79 1",
 " 	c None",
@ -96,3 +99,5 @@ static const char * import_module_xpm[] = {
 "     ........   ",
 "                ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Insert_Module_Board.xpm
+++ b/pcbnew/bitmaps/Insert_Module_Board.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* insert_module_board_xpm[];
+#else
 static const char * insert_module_board_xpm[] = {
 "16 16 49 1",
 " 	c None",
@ -66,3 +69,5 @@ static const char * insert_module_board_xpm[] = {
 ".7d90efghij5    ",
 "............    ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Invert_Module.xpm
+++ b/pcbnew/bitmaps/Invert_Module.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* invert_module_xpm[];
+#else
 static const char * invert_module_xpm[] = {
 "16 16 31 1",
 " 	c None",
@ -48,3 +51,5 @@ static const char * invert_module_xpm[] = {
 " ++++++  ...... ",
 "       .        ",
 "       .        "};
+
+#endif
--- a/pcbnew/bitmaps/Load_Module_Board.xpm
+++ b/pcbnew/bitmaps/Load_Module_Board.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* load_module_board_xpm[];
+#else
 static const char * load_module_board_xpm[] = {
 "16 16 80 1",
 " 	c None",
@ -97,3 +100,5 @@ static const char * load_module_board_xpm[] = {
 ".AICDJKLMNOy    ",
 "............    ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Load_Module_Lib.xpm
+++ b/pcbnew/bitmaps/Load_Module_Lib.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Load_Module_Lib_xpm[];
+#else
 static const char * Load_Module_Lib_xpm[] = {
 "16 16 143 2",
 "  	c None",
@ -160,3 +163,5 @@ static const char * Load_Module_Lib_xpm[] = {
 "          b.c.d.e.f.g.h.i.      ",
 "                  j.k.l.        ",
 "                                "};
+
+#endif
--- a/pcbnew/bitmaps/Locked.xpm
+++ b/pcbnew/bitmaps/Locked.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Locked_xpm[];
+#else
 static const char * Locked_xpm[] = {
 "16 16 90 1",
 " 	c None",
@ -107,3 +110,5 @@ static const char * Locked_xpm[] = {
 "  .RSTTUUVWXY.  ",
 "   ..........   ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Mode_Module.xpm
+++ b/pcbnew/bitmaps/Mode_Module.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* mode_module_xpm[];
+#else
 static const char * mode_module_xpm[] = {
 "16 16 96 2",
 "  	c None",
@ -113,3 +116,5 @@ static const char * mode_module_xpm[] = {
 ".   . + L T U V W X Y + .   .   ",
 ". ' . + Z Z `  ...+.Z + . @..   ",
 "                                "};
+
+#endif
--- a/pcbnew/bitmaps/Mode_Track.xpm
+++ b/pcbnew/bitmaps/Mode_Track.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* mode_track_xpm[];
+#else
 static const char * mode_track_xpm[] = {
 "16 16 42 1",
 " 	c None",
@ -59,3 +62,5 @@ static const char * mode_track_xpm[] = {
 "   ..<    0ab<0 ",
 "   ..      +.c  ",
 "   ..      +.   "};
+
+#endif
--- a/pcbnew/bitmaps/Modul_Edit.xpm
+++ b/pcbnew/bitmaps/Modul_Edit.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Modul_Edit_xpm[];
+#else
 static const char * Modul_Edit_xpm[] = {
 "16 16 37 1",
 " 	c None",
@ -54,3 +57,5 @@ static const char * Modul_Edit_xpm[] = {
 "@.%.@@.%.@@.%.@@",
 " ...  ...  ...  ",
 " ...  ...  ...  "};
+
+#endif
--- a/pcbnew/bitmaps/Module_Check.xpm
+++ b/pcbnew/bitmaps/Module_Check.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* module_check_xpm[];
+#else
 static const char * module_check_xpm[] = {
 "16 16 129 2",
 "  	c None",
@ -146,3 +149,5 @@ static const char * module_check_xpm[] = {
 ".   . + /./.}.|.1.<.2.+ 3.  .   ",
 ". r . + 4.4.4.4.5.6.7.+ . 8..   ",
 "                    +           "};
+
+#endif
--- a/pcbnew/bitmaps/Module_Ratsnet.xpm
+++ b/pcbnew/bitmaps/Module_Ratsnet.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Module_Ratsnet_xpm[];
+#else
 static const char * Module_Ratsnet_xpm[] = {
 "16 16 39 1",
 " 	c None",
@ -56,3 +59,5 @@ static const char * Module_Ratsnet_xpm[] = {
 "          8 8 8 ",
 "           888  ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Move_Field.xpm
+++ b/pcbnew/bitmaps/Move_Field.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Move_Field_xpm[];
+#else
 static const char * Move_Field_xpm[] = {
 "16 16 62 1",
 " 	c None",
@ -79,3 +82,5 @@ static const char * Move_Field_xpm[] = {
 "       %stu%%   ",
 "        pvw%    ",
 "         %      "};
+
+#endif
--- a/pcbnew/bitmaps/Move_Module.xpm
+++ b/pcbnew/bitmaps/Move_Module.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Move_Module_xpm[];
+#else
 static const char * Move_Module_xpm[] = {
 "16 16 55 1",
 " 	c None",
@ -72,3 +75,5 @@ static const char * Move_Module_xpm[] = {
 "       .lmn..   ",
 "        iop.    ",
 "         .      "};
+
+#endif
--- a/pcbnew/bitmaps/Move_Pad.xpm
+++ b/pcbnew/bitmaps/Move_Pad.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* move_pad_xpm[];
+#else
 static const char * move_pad_xpm[] = {
 "16 16 44 1",
 " 	c None",
@ -61,3 +64,5 @@ static const char * move_pad_xpm[] = {
 "       .abc..   ",
 "        8de.    ",
 "         .      "};
+
+#endif
--- a/pcbnew/bitmaps/Move_Pin.xpm
+++ b/pcbnew/bitmaps/Move_Pin.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Move_Pin_xpm[];
+#else
 static const char * Move_Pin_xpm[] = {
 "16 16 56 1",
 " 	c None",
@ -73,3 +76,5 @@ static const char * Move_Pin_xpm[] = {
 "       [mno[[   ",
 "        jpq[    ",
 "         [      "};
+
+#endif
--- a/pcbnew/bitmaps/Move_Track.xpm
+++ b/pcbnew/bitmaps/Move_Track.xpm
@ -1,4 +1,7 @@
-/* XPM */ 
+/* XPM */
+#ifndef XPMMAIN
+extern const char* move_track_xpm[];
+#else
 static const char * move_track_xpm[] = {
 "16 16 41 1",
 " 	c None",
@ -58,3 +61,5 @@ static const char * move_track_xpm[] = {
 "        CIJ!    ",
 "         !      ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Move_Track_Segment.xpm
+++ b/pcbnew/bitmaps/Move_Track_Segment.xpm
@ -1,4 +1,7 @@
-/* XPM */ 
+/* XPM */
+#ifndef XPMMAIN
+extern const char* move_track_segment_xpm[];
+#else
 static const char * move_track_segment_xpm[] = {
 "16 16 41 1",
 " 	c None",
@ -58,3 +61,5 @@ static const char * move_track_segment_xpm[] = {
 "        CIJ!    ",
 "         !      ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Net_HighLight.xpm
+++ b/pcbnew/bitmaps/Net_HighLight.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Net_HighLight_xpm[];
+#else
 static const char * Net_HighLight_xpm[] = {
 "16 16 74 1",
 " 	c None",
@ -91,3 +94,5 @@ static const char * Net_HighLight_xpm[] = {
 "   .A   BCDEF   ",
 "   .G   33 H+   ",
 "   ..      I+   "};
+
+#endif
--- a/pcbnew/bitmaps/Net_Locked.xpm
+++ b/pcbnew/bitmaps/Net_Locked.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Net_Locked_xpm[];
+#else
 static const char * Net_Locked_xpm[] = {
 "16 16 90 1",
 " 	c None",
@ -107,3 +110,5 @@ static const char * Net_Locked_xpm[] = {
 "    'ABCDEEFGHI'",
 "    'JKLMNNNOPz'",
 "    'QRSTUUVWXY'"};
+
+#endif
--- a/pcbnew/bitmaps/Net_UnLocked.xpm
+++ b/pcbnew/bitmaps/Net_UnLocked.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Net_UnLocked_xpm[];
+#else
 static const char * Net_UnLocked_xpm[] = {
 "16 16 90 1",
 " 	c None",
@ -107,3 +110,5 @@ static const char * Net_UnLocked_xpm[] = {
 "    ,ABCDEEFGHI,",
 "    ,JKLMNNNOPz,",
 "    ,QRSTUUVWXY,"};
+
+#endif
--- a/pcbnew/bitmaps/New_FootPrint.xpm
+++ b/pcbnew/bitmaps/New_FootPrint.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* new_footprint_xpm[];
+#else
 static const char * new_footprint_xpm[] = {
 "16 16 15 1",
 " 	c None",
@ -33,3 +36,4 @@ static const char * new_footprint_xpm[] = {
 "  @@@@@@@@      ",
 "                "};

+#endif
--- a/pcbnew/bitmaps/New_Module.xpm
+++ b/pcbnew/bitmaps/New_Module.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* New_Module_xpm[];
+#else
 static const char * New_Module_xpm[] = {
 "16 16 73 1",
 " 	c None",
@ -90,3 +93,5 @@ static const char * New_Module_xpm[] = {
 "  @EFGHDD@      ",
 "  @@@@@@@@      ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Options_All_Tracks&Vias.xpm
+++ b/pcbnew/bitmaps/Options_All_Tracks&Vias.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* options_all_tracks_and_vias_xpm[];
+#else
 static const char * options_all_tracks_and_vias_xpm[] = {
 "16 16 49 1",
 " 	c None",
@ -66,3 +69,5 @@ static const char * options_all_tracks_and_vias_xpm[] = {
 "#&+^]/!97<!0abcd",
 "-;e!]([!!!23ffff",
 "   !](ghi2j5!!!["};
+
+#endif
--- a/pcbnew/bitmaps/Options_All_Tracks.xpm
+++ b/pcbnew/bitmaps/Options_All_Tracks.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Options_All_Tracks_xpm[];
+#else
 static const char * Options_All_Tracks_xpm[] = {
 "16 16 39 1",
 " 	c None",
@ -56,3 +59,5 @@ static const char * Options_All_Tracks_xpm[] = {
 "   *;>*|[)*12345",
 "   *;,!***/(6666",
 "   *;,789/0:***!"};
+
+#endif
--- a/pcbnew/bitmaps/Options_All_Vias.xpm
+++ b/pcbnew/bitmaps/Options_All_Vias.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Options_All_Vias_xpm[];
+#else
 static const char * Options_All_Vias_xpm[] = {
 "16 16 56 1",
 " 	c None",
@ -73,3 +76,5 @@ static const char * Options_All_Vias_xpm[] = {
 " +@_bc:fd2:ghijk",
 "+$ :bl3:::78mmmm",
 ";> :blnop7q0:::3"};
+
+#endif
--- a/pcbnew/bitmaps/Options_Module.xpm
+++ b/pcbnew/bitmaps/Options_Module.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Options_Module_xpm[];
+#else
 static const char * Options_Module_xpm[] = {
 "16 16 53 1",
 " 	c None",
@ -70,3 +73,5 @@ static const char * Options_Module_xpm[] = {
 "   .<1.dc3.efghi",
 "   .<+4...89jjjj",
 "   .<+klm8na...4"};
+
+#endif
--- a/pcbnew/bitmaps/Options_Track.xpm
+++ b/pcbnew/bitmaps/Options_Track.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Options_Track_xpm[];
+#else
 static const char * Options_Track_xpm[] = {
 "16 16 45 1",
 " 	c None",
@ -62,3 +65,5 @@ static const char * Options_Track_xpm[] = {
 "   ,~],536,7890a",
 "   ,~^(,,,[}bbbb",
 "   ,~^cde[f1,,,("};
+
+#endif
--- a/pcbnew/bitmaps/Options_Tracks.xpm
+++ b/pcbnew/bitmaps/Options_Tracks.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Options_Tracks_xpm[];
+#else
 static const char * Options_Tracks_xpm[] = {
 "16 16 36 1",
 " 	c None",
@ -53,3 +56,5 @@ static const char * Options_Tracks_xpm[] = {
 "   &-;&<_,&[}|12",
 "   &->'&&&{]3333",
 "   &->456{7/&&&'"};
+
+#endif
--- a/pcbnew/bitmaps/Options_Vias.xpm
+++ b/pcbnew/bitmaps/Options_Vias.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Options_Vias_xpm[];
+#else
 static const char * Options_Vias_xpm[] = {
 "16 16 44 1",
 " 	c None",
@ -61,3 +64,5 @@ static const char * Options_Vias_xpm[] = {
 "    .!]/...<[777",
 "    .!]890<a|...",
 "    .!]bccde.(_:"};
+
+#endif
--- a/pcbnew/bitmaps/PcbOffset.xpm
+++ b/pcbnew/bitmaps/PcbOffset.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* pcb_offset_xpm[];
+#else
 static const char * pcb_offset_xpm[] = {
 "16 16 7 1",
 " 	c None",
@ -24,3 +27,5 @@ static const char * pcb_offset_xpm[] = {
 "            .   ",
 "      +     .   ",
 "      +     .   "};
+
+#endif
--- a/pcbnew/bitmaps/Post_Compo.xpm
+++ b/pcbnew/bitmaps/Post_Compo.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* post_compo_xpm[];
+#else
 static const char * post_compo_xpm[] = {
 "16 16 62 1",
 " 	c None",
@ -79,3 +82,5 @@ static const char * post_compo_xpm[] = {
 ".#>>>>>>>>>>5.  ",
 ".555555555555.  ",
 "..............  "};
+
+#endif
--- a/pcbnew/bitmaps/Post_Drill.xpm
+++ b/pcbnew/bitmaps/Post_Drill.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* post_drill_xpm[];
+#else
 static const char * post_drill_xpm[] = {
 "16 16 35 1",
 " 	c None",
@ -52,3 +55,5 @@ static const char * post_drill_xpm[] = {
 ".#>>>>&,>>>>2.  ",
 ".222222522222.  ",
 "..............  "};
+
+#endif
--- a/pcbnew/bitmaps/Post_Module.xpm
+++ b/pcbnew/bitmaps/Post_Module.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Post_Module_xpm[];
+#else
 static const char * Post_Module_xpm[] = {
 "16 16 52 1",
 " 	c None",
@ -69,3 +72,5 @@ static const char * Post_Module_xpm[] = {
 ".#>......>>>1.  ",
 ".111111111111.  ",
 "..............  "};
+
+#endif
--- a/pcbnew/bitmaps/Rotate_Field.xpm
+++ b/pcbnew/bitmaps/Rotate_Field.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Rotate_Field_xpm[];
+#else
 static const char * Rotate_Field_xpm[] = {
 "16 16 76 1",
 " 	c None",
@ -93,3 +96,5 @@ static const char * Rotate_Field_xpm[] = {
 "     FGHIJ8DE%  ",
 "       %%%Kz%   ",
 "          %%    "};
+
+#endif
--- a/pcbnew/bitmaps/Rotate_Module+.xpm
+++ b/pcbnew/bitmaps/Rotate_Module+.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* rotate_module_pos_xpm[];
+#else
 static const char * rotate_module_pos_xpm[] = {
 "16 16 77 1",
 " 	c None",
@ -94,3 +97,5 @@ static const char * rotate_module_pos_xpm[] = {
 "     .CD3GHIJK  ",
 "      .uL...    ",
 "       ..       "};
+
+#endif
--- a/pcbnew/bitmaps/Rotate_Module-.xpm
+++ b/pcbnew/bitmaps/Rotate_Module-.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* rotate_module_neg_xpm[];
+#else
 static const char * rotate_module_neg_xpm[] = {
 "16 16 89 1",
 " 	c None",
@ -106,3 +109,5 @@ static const char * rotate_module_neg_xpm[] = {
 "     .QRSTUVW   ",
 "          XL    ",
 "          .     "};
+
+#endif
--- a/pcbnew/bitmaps/Select_Layer_Pair.xpm
+++ b/pcbnew/bitmaps/Select_Layer_Pair.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* select_layer_pair_xpm[];
+#else
 static const char * select_layer_pair_xpm[] = {
 "16 16 75 1",
 " 	c None",
@ -92,3 +95,5 @@ static const char * select_layer_pair_xpm[] = {
 "    ............",
 "                ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Select_W_Layer.xpm
+++ b/pcbnew/bitmaps/Select_W_Layer.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Select_W_Layer_xpm[];
+#else
 static const char * Select_W_Layer_xpm[] = {
 "16 16 24 1",
 " 	c None",
@ -41,3 +44,5 @@ static const char * Select_W_Layer_xpm[] = {
 "    ............",
 "                ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Show_Zone.xpm
+++ b/pcbnew/bitmaps/Show_Zone.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* show_zone_xpm[];
+#else
 static const char * show_zone_xpm[] = {
 "16 16 71 1",
 " 	c None",
@ -88,3 +91,5 @@ static const char * show_zone_xpm[] = {
 "..mnopqrstuvw. .",
 "...xy|zA&BCD... ",
 ".....0E!F...... "};
+
+#endif
--- a/pcbnew/bitmaps/Swap_Layer.xpm
+++ b/pcbnew/bitmaps/Swap_Layer.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* swap_layer_xpm[];
+#else
 static const char * swap_layer_xpm[] = {
 "16 16 6 1",
 " 	c None",
@ -23,3 +26,5 @@ static const char * swap_layer_xpm[] = {
 "  ++++$#########",
 "    + ##########",
 "      ##########"};
+
+#endif
--- a/pcbnew/bitmaps/Track_Locked.xpm
+++ b/pcbnew/bitmaps/Track_Locked.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Track_Locked_xpm[];
+#else
 static const char * Track_Locked_xpm[] = {
 "16 16 89 1",
 " 	c None",
@ -106,3 +109,5 @@ static const char * Track_Locked_xpm[] = {
 "    ,zABCDDEFGH,",
 "    ,IJKLMMMNOy,",
 "    ,PQRSTTUVWX,"};
+
+#endif
--- a/pcbnew/bitmaps/Track_Sketch.xpm
+++ b/pcbnew/bitmaps/Track_Sketch.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Track_Sketch_xpm[];
+#else
 static const char * Track_Sketch_xpm[] = {
 "16 16 5 1",
 " 	c None",
@ -22,3 +25,5 @@ static const char * Track_Sketch_xpm[] = {
 "       +++@#+@#+",
 "          .. .. ",
 "          .. .. "};
+
+#endif
--- a/pcbnew/bitmaps/Track_UnLocked.xpm
+++ b/pcbnew/bitmaps/Track_UnLocked.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Track_UnLocked_xpm[];
+#else
 static const char * Track_UnLocked_xpm[] = {
 "16 16 81 1",
 " 	c None",
@ -98,3 +101,5 @@ static const char * Track_UnLocked_xpm[] = {
 "    $rstuvvwxyz$",
 "    $ABCDEEEFGq$",
 "    $HIJKLLMNOP$"};
+
+#endif
--- a/pcbnew/bitmaps/Unlocked.xpm
+++ b/pcbnew/bitmaps/Unlocked.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* Unlocked_xpm[];
+#else
 static const char * Unlocked_xpm[] = {
 "16 16 88 1",
 " 	c None",
@ -105,3 +108,5 @@ static const char * Unlocked_xpm[] = {
 "    .PQRRSSTUVW.",
 "     .......... ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Update_Module_Board.xpm
+++ b/pcbnew/bitmaps/Update_Module_Board.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* update_module_board_xpm[];
+#else
 static const char * update_module_board_xpm[] = {
 "16 16 81 1",
 " 	c None",
@ -98,3 +101,5 @@ static const char * update_module_board_xpm[] = {
 ".CJEFKLMNOPA    ",
 "............    ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Width_Net.xpm
+++ b/pcbnew/bitmaps/Width_Net.xpm
@ -1,4 +1,7 @@
-/* XPM */ 
+/* XPM */
+#ifndef XPMMAIN
+extern const char* width_net_xpm[];
+#else
 static const char * width_net_xpm[] = {
 "16 16 6 1",
 " 	c None",
@ -23,3 +26,5 @@ static const char * width_net_xpm[] = {
 "   !   %%   ##  ",
 "   !   %%    ## ",
 "       %%     ##"};
+
+#endif
--- a/pcbnew/bitmaps/Width_Track.xpm
+++ b/pcbnew/bitmaps/Width_Track.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* width_track_xpm[];
+#else
 static const char * width_track_xpm[] = {
 "16 16 9 1",
 " 	c None",
@ -26,3 +29,5 @@ static const char * width_track_xpm[] = {
 "   .       *++++",
 "   .            ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Width_Track_Via.xpm
+++ b/pcbnew/bitmaps/Width_Track_Via.xpm
@ -1,4 +1,7 @@
-/* XPM */ 
+/* XPM */
+#ifndef XPMMAIN
+extern const char* width_track_via_xpm[];
+#else
 static const char * width_track_via_xpm[] = {
 "16 16 10 1",
 " 	c None",
@ -27,3 +30,5 @@ static const char * width_track_via_xpm[] = {
 "   !       *$$$$",
 "   !            ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/Width_Vias.xpm
+++ b/pcbnew/bitmaps/Width_Vias.xpm
@ -1,4 +1,7 @@
-/* XPM */ 
+/* XPM */
+#ifndef XPMMAIN
+extern const char* width_vias_xpm[];
+#else
 static const char * width_vias_xpm[] = {
 "16 16 5 1",
 " 	c None",
@ -22,3 +25,5 @@ static const char * width_vias_xpm[] = {
 "   !      %    %",
 "   !       %  % ",
 "            %%  "};
+
+#endif
--- a/pcbnew/bitmaps/add_cotation.xpm
+++ b/pcbnew/bitmaps/add_cotation.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* add_cotation_xpm[];
+#else
 static const char * add_cotation_xpm[] = {
 "16 16 14 1",
 " 	c None",
@ -31,3 +34,5 @@ static const char * add_cotation_xpm[] = {
 "+             + ",
 "+             + ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/local_ratsnet.xpm
+++ b/pcbnew/bitmaps/local_ratsnet.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* local_ratsnet_xpm[];
+#else
 static const char * local_ratsnet_xpm[] = {
 "16 16 61 1",
 " 	c None",
@ -78,3 +81,5 @@ static const char * local_ratsnet_xpm[] = {
 ".       + +qrs .",
 "           tuv  ",
 "           ++   "};
+
+#endif
--- a/pcbnew/bitmaps/module_options.xpm
+++ b/pcbnew/bitmaps/module_options.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* module_options_xpm[];
+#else
 static const char * module_options_xpm[] = {
 "16 16 65 1",
 " 	c None",
@ -82,3 +85,5 @@ static const char * module_options_xpm[] = {
 ". .+rrrrrrr+. . ",
 ".b.+yyyyyyy+.z. ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/mw_Add_Gap.xpm
+++ b/pcbnew/bitmaps/mw_Add_Gap.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* mw_Add_Gap_xpm[];
+#else
 static const char * mw_Add_Gap_xpm[] = {
 "16 16 13 1",
 " 	c None",
@ -30,3 +33,5 @@ static const char * mw_Add_Gap_xpm[] = {
 "    *=+++-*;$   ",
 "    &>   # +    ",
 "      +   +     "};
+
+#endif
--- a/pcbnew/bitmaps/mw_Add_Line.xpm
+++ b/pcbnew/bitmaps/mw_Add_Line.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* mw_Add_Line_xpm[];
+#else
 static const char * mw_Add_Line_xpm[] = {
 "16 16 6 1",
 " 	c None",
@ -23,3 +26,5 @@ static const char * mw_Add_Line_xpm[] = {
 " @@@@@@@@@@@@@@ ",
 "  @          @  ",
 "   @        @   "};
+
+#endif
--- a/pcbnew/bitmaps/mw_Add_Shape.xpm
+++ b/pcbnew/bitmaps/mw_Add_Shape.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* mw_Add_Shape_xpm[];
+#else
 static const char * mw_Add_Shape_xpm[] = {
 "16 16 21 1",
 " 	c None",
@ -38,3 +41,5 @@ static const char * mw_Add_Shape_xpm[] = {
 "            %%  ",
 "                ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/mw_Add_Stub.xpm
+++ b/pcbnew/bitmaps/mw_Add_Stub.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* mw_Add_Stub_xpm[];
+#else
 static const char * mw_Add_Stub_xpm[] = {
 "16 16 14 1",
 " 	c None",
@ -31,3 +34,5 @@ static const char * mw_Add_Stub_xpm[] = {
 "   ....@   >=,@@",
 "    @@@@     @@ ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/mw_Add_stub_arc.xpm
+++ b/pcbnew/bitmaps/mw_Add_stub_arc.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* mw_Add_stub_arc_xpm[];
+#else
 static const char * mw_Add_stub_arc_xpm[] = {
 "16 16 55 1",
 " 	c None",
@ -72,3 +75,5 @@ static const char * mw_Add_stub_arc_xpm[] = {
 "   <<<<>     >  ",
 "   <<<<>        ",
 "    >>>>        "};
+
+#endif
--- a/pcbnew/bitmaps/mw_toolbar.xpm
+++ b/pcbnew/bitmaps/mw_toolbar.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* mw_toolbar_xpm[];
+#else
 static const char * mw_toolbar_xpm[] = {
 "16 16 67 1",
 " 	c None",
@ -84,3 +87,5 @@ static const char * mw_toolbar_xpm[] = {
 "8r|sntu8|vntwx|y",
 "||8..z||AB.z||A ",
 "                "};
+
+#endif
--- a/pcbnew/bitmaps/net_hightlight.xpm
+++ b/pcbnew/bitmaps/net_hightlight.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* net_hightlight_xpm[];
+#else
 const char *net_hightlight_xpm[] = {
 /* columns rows colors const chars-per-pixel */
 "16 16 3 1",
@ -24,3 +27,4 @@ const char *net_hightlight_xpm[] = {
 "XXXXXXXXXXXXXXXX"
 };

+#endif
--- a/pcbnew/bitmaps/tool_ratsnet.xpm
+++ b/pcbnew/bitmaps/tool_ratsnet.xpm
@ -1,4 +1,7 @@
 /* XPM */
+#ifndef XPMMAIN
+extern const char* tool_ratsnet_xpm[];
+#else
 static const char * tool_ratsnet_xpm[] = {
 "16 16 53 1",
 " 	c None",
@ -70,3 +73,5 @@ static const char * tool_ratsnet_xpm[] = {
 "     .i  cjkc   ",
 "     .l   mn    ",
 "     ..   c     "};
+
+#endif