New UI merged

cmake/Bitmaps.cmake

@@ -7,18 +7,19 @@ macro(add_bitmaps_target targetname filter width format)
     add_custom_command(
       OUTPUT ${target}
       COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/img2lbm.py ${bitmap} ${target} ${width} ${format} ${ARGN}
-      DEPENDS ${bitmap}
+      DEPENDS ${bitmap} ${RADIO_DIRECTORY}/util/img2lbm.py
     )
     list(APPEND bitmaps_files ${target})
   endforeach()
   add_custom_target(${targetname} DEPENDS ${bitmaps_files})
-endmacro(add_bitmaps_target)
+endmacro()
 
-macro(add_truetype_font_target radio name font size offset)
-  set(target ${RADIO_SRC_DIRECTORY}/fonts/${radio}/font_${name})
-  add_custom_target(ttf_${radio}_${name}
+macro(add_truetype_font_target name font size offset)
+  set(target ${RADIO_SRC_DIRECTORY}/fonts/truetype/font_${name})
+  add_custom_target(truetype_font_${name}
     COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/font2png.py ${font} ${size} ${offset} ${target}
     WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
+    DEPENDS ${RADIO_DIRECTORY}/util/font2png.py
   )
-  set(ttf_${radio}_fonts_targets ${ttf_${radio}_fonts_targets} ttf_${radio}_${name})
-endmacro(add_truetype_font_target)
+  set(truetype_fonts_targets ${truetype_fonts_targets} truetype_font_${name})
+endmacro()