Remove ENABLE_UI option (#4619)

Now we use the LAF_BACKEND=none/skia to detect if it's going to be the CLI/GUI version of the program. The ENABLE_UI flag is still defined at compile-time just to avoid removing all #ifdef/endif conditional directives right now.
2025-03-01 01:13:40 +00:00 · 2024-09-02 17:13:53 -03:00 · 2024-09-02 17:13:53 -03:00 · c4526cf709
commit c4526cf709
parent fea3f5fcee
4 changed files with 244 additions and 255 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -62,10 +62,8 @@ jobs:
        fi

        if [[ "${{ matrix.ui }}" == "gui" ]] ; then
-          export enable_ui=on
          export laf_backend=skia
        else
-          export enable_ui=off
          export laf_backend=none
        fi

@ -85,7 +83,6 @@ jobs:
          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
          -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 \
          -DENABLE_TESTS=ON \
-          -DENABLE_UI=$enable_ui \
          -DENABLE_SCRIPTING=$enable_scripting \
          -DENABLE_CCACHE=$enable_ccache \
          -DLAF_BACKEND=$laf_backend \
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -59,7 +59,6 @@ option(ENABLE_TRIAL_MODE   "Compile the trial version" off)
 option(ENABLE_DRM          "Compile the DRM-enabled version (e.g. for automatic updates)" off)
 option(ENABLE_STEAM        "Compile with Steam library" off)
 option(ENABLE_DEVMODE      "Compile vesion for developers" off)
-option(ENABLE_UI           "Compile UI (turn off to compile CLI-only version)" on)
 option(ENABLE_I18N_STRINGS "Clone i18n strings repo (https://github.com/aseprite/strings) to bin/data/strings.git" off)
 option(FULLSCREEN_PLATFORM "Enable fullscreen by default" off)
 option(ENABLE_CLANG_TIDY   "Enable static analysis" off)
@ -98,12 +97,9 @@ if(REQUIRE_CURL AND NOT USE_SHARED_CURL)
  endif()
 endif()

-if(NOT LAF_OS_BACKEND)
-  if(NOT ENABLE_UI)
-    set(LAF_OS_BACKEND "none") # Without UI, we use the none backend
-  else()
-    set(LAF_OS_BACKEND "skia")
-  endif()
+# By default we'll try to use Skia back-end
+if(NOT LAF_BACKEND)
+  set(LAF_BACKEND "skia")
 endif()

 if(ENABLE_DRM AND NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/drm/CMakeLists.txt)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -16,7 +16,7 @@ endif()
 if(MSVC)
  # As Skia is compiled with /GL flag (whole program optimization),
  # the linker prefer a /LTCG parameter to improve link times.
-  if(LAF_OS_BACKEND STREQUAL "skia")
+  if(LAF_BACKEND STREQUAL "skia")
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
  endif()

@ -183,7 +183,7 @@ if(ENABLE_ASEPRITE_EXE)
  add_executable(${main_target}
    main/main.cpp
    ${main_resources})
-  if(ENABLE_UI)
+  if(LAF_BACKEND STREQUAL "skia")
    if(WIN32)
      set_target_properties(${main_target} PROPERTIES WIN32_EXECUTABLE true)
    endif()
@ -192,9 +192,9 @@ if(ENABLE_ASEPRITE_EXE)
  target_link_libraries(${main_target} app-lib)
  add_dependencies(${main_target} copy_data)

-  if(LAF_OS_BACKEND_LINK_FLAGS)
+  if(LAF_BACKEND_LINK_FLAGS)
    set_target_properties(${main_target} PROPERTIES LINK_FLAGS
-      ${LAF_OS_BACKEND_LINK_FLAGS})
+      ${LAF_BACKEND_LINK_FLAGS})
  endif()

  install(TARGETS ${main_target}
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@ -95,6 +95,10 @@ add_definitions(-DLIBARCHIVE_STATIC)

 add_library(app-lib ${generated_files})

+# ENABLE_UI is always defined because there are still #ifdef/endif
+# using it, but we should remove it.
+target_compile_definitions(app-lib PUBLIC -DENABLE_UI)
+
 # These specific-platform files should be in an external library
 # (e.g. "base" or "os").
 if(WIN32)
@ -113,7 +117,7 @@ else()
 endif()

 # Data recovery
-if(ENABLE_UI AND (NOT ENABLE_TRIAL_MODE OR ENABLE_DRM))
+if(NOT ENABLE_TRIAL_MODE OR ENABLE_DRM)
  set(ENABLE_DATA_RECOVERY on)
 else()
  set(ENABLE_DATA_RECOVERY off)
@ -170,14 +174,6 @@ if(ENABLE_SCRIPTING)
  target_link_libraries(app-lib lua lauxlib lualib)
  target_compile_definitions(app-lib PUBLIC -DENABLE_SCRIPTING)

-  if(ENABLE_UI)
-    target_sources(app-lib PRIVATE
-      commands/cmd_developer_console.cpp
-      commands/cmd_open_script_folder.cpp
-      commands/debugger.cpp
-      ui/devconsole_view.cpp)
-  endif()
-
  if(ENABLE_WEBSOCKET)
    target_link_libraries(app-lib ixwebsocket)
    target_compile_definitions(app-lib PUBLIC -DENABLE_WEBSOCKET)
@ -186,11 +182,14 @@ if(ENABLE_SCRIPTING)
  endif()

  target_sources(app-lib PRIVATE
+    commands/cmd_developer_console.cpp
+    commands/cmd_open_script_folder.cpp
    commands/cmd_run_script.cpp
+    commands/debugger.cpp
    script/app_command_object.cpp
    script/app_fs_object.cpp
-    script/app_os_object.cpp
    script/app_object.cpp
+    script/app_os_object.cpp
    script/app_theme_object.cpp
    script/brush_class.cpp
    script/canvas_widget.cpp
@ -245,249 +244,23 @@ if(ENABLE_SCRIPTING)
    script/values.cpp
    script/version_class.cpp
    script/window_class.cpp
-    shell.cpp)
-endif()
-
-# UI-only files
-if(ENABLE_UI)
-  target_compile_definitions(app-lib PUBLIC -DENABLE_UI)
-  target_sources(app-lib PRIVATE
-    app_brushes.cpp
-    app_menus.cpp
-    closed_docs.cpp
-    commands/cmd_about.cpp
-    commands/cmd_advanced_mode.cpp
-    commands/cmd_cancel.cpp
-    commands/cmd_cel_properties.cpp
-    commands/cmd_change_brush.cpp
-    commands/cmd_change_color.cpp
-    commands/cmd_clear.cpp
-    commands/cmd_clear_cel.cpp
-    commands/cmd_clear_recent_files.cpp
-    commands/cmd_close_file.cpp
-    commands/cmd_contiguous_fill.cpp
-    commands/cmd_copy.cpp
-    commands/cmd_copy_cel.cpp
-    commands/cmd_copy_merged.cpp
-    commands/cmd_cut.cpp
-    commands/cmd_discard_brush.cpp
-    commands/cmd_duplicate_layer.cpp
-    commands/cmd_duplicate_sprite.cpp
-    commands/cmd_duplicate_view.cpp
-    commands/cmd_exit.cpp
-    commands/cmd_eyedropper.cpp
-    commands/cmd_fit_screen.cpp
-    commands/cmd_frame_properties.cpp
-    commands/cmd_frame_tag_properties.cpp
-    commands/cmd_fullscreen_mode.cpp
-    commands/cmd_fullscreen_preview.cpp
-    commands/cmd_goto_frame.cpp
-    commands/cmd_goto_layer.cpp
-    commands/cmd_goto_tab.cpp
-    commands/cmd_grid.cpp
-    commands/cmd_home.cpp
-    commands/cmd_invert_mask.cpp
-    commands/cmd_keyboard_shortcuts.cpp
-    commands/cmd_launch.cpp
-    commands/cmd_layer_lock.cpp
-    commands/cmd_layer_opacity.cpp
-    commands/cmd_layer_properties.cpp
-    commands/cmd_layer_visibility.cpp
-    commands/cmd_link_cels.cpp
-    commands/cmd_load_mask.cpp
-    commands/cmd_mask_by_color.cpp
-    commands/cmd_mask_content.cpp
-    commands/cmd_modify_selection.cpp
-    commands/cmd_move_cel.cpp
-    commands/cmd_move_mask.cpp
-    commands/cmd_new_brush.cpp
-    commands/cmd_new_frame_tag.cpp
-    commands/cmd_new_sprite_from_selection.cpp
-    commands/cmd_onionskin.cpp
-    commands/cmd_open_browser.cpp
-    commands/cmd_open_group.cpp
-    commands/cmd_open_in_folder.cpp
-    commands/cmd_open_with_app.cpp
-    commands/cmd_options.cpp
-    commands/cmd_palette_editor.cpp
-    commands/cmd_paste.cpp
-    commands/cmd_paste_text.cpp
-    commands/cmd_pixel_perfect_mode.cpp
-    commands/cmd_play_animation.cpp
-    commands/cmd_refresh.cpp
-    commands/cmd_enter_license.cpp
-    commands/cmd_remove_frame.cpp
-    commands/cmd_remove_frame_tag.cpp
-    commands/cmd_remove_slice.cpp
-    commands/cmd_reopen_closed_file.cpp
-    commands/cmd_repeat_last_export.cpp
-    commands/cmd_reselect_mask.cpp
-    commands/cmd_reverse_frames.cpp
-    commands/cmd_rotate.cpp
-    commands/cmd_save_mask.cpp
-    commands/cmd_save_palette.cpp
-    commands/cmd_select_palette.cpp
-    commands/cmd_scroll.cpp
-    commands/cmd_scroll_center.cpp
-    commands/cmd_select_tile.cpp
-    commands/cmd_set_color_selector.cpp
-    commands/cmd_set_ink_type.cpp
-    commands/cmd_set_loop_section.cpp
-    commands/cmd_set_palette.cpp
-    commands/cmd_set_palette_entry_size.cpp
-    commands/cmd_set_same_ink.cpp
-    commands/cmd_slice_properties.cpp
-    commands/cmd_sprite_properties.cpp
-    commands/cmd_swap_checkerboard_colors.cpp
-    commands/cmd_switch_colors.cpp
-    commands/cmd_symmetry_mode.cpp
-    commands/cmd_tiled_mode.cpp
-    commands/cmd_timeline.cpp
-    commands/cmd_toggle_preview.cpp
-    commands/cmd_toggle_tiles_mode.cpp
-    commands/cmd_toggle_timeline_thumbnails.cpp
-    commands/cmd_undo_history.cpp
-    commands/cmd_unlink_cel.cpp
-    commands/cmd_zoom.cpp
-    commands/filters/filter_preview.cpp
-    commands/filters/filter_target_buttons.cpp
-    commands/filters/filter_window.cpp
-    commands/screenshot.cpp
-    commands/set_playback_speed.cpp
-    commands/show_menu.cpp
-    commands/tileset_mode.cpp
-    commands/toggle_other_layers_opacity.cpp
-    commands/toggle_play_option.cpp
-    file_selector.cpp
-    modules/gfx.cpp
-    modules/gui.cpp
-    ui/alpha_entry.cpp
-    ui/alpha_slider.cpp
-    ui/app_menuitem.cpp
-    ui/backup_indicator.cpp
-    ui/browser_view.cpp
-    ui/brush_popup.cpp
-    ui/button_set.cpp
-    ui/color_bar.cpp
-    ui/color_button.cpp
-    ui/color_popup.cpp
-    ui/color_selector.cpp
-    ui/color_shades.cpp
-    ui/color_sliders.cpp
-    ui/color_spectrum.cpp
-    ui/color_tint_shade_tone.cpp
-    ui/color_wheel.cpp
-    ui/configure_timeline_popup.cpp
-    ui/context_bar.cpp
-    ui/dithering_selector.cpp
-    ui/doc_view.cpp
-    ui/drop_down_button.cpp
-    ui/dynamics_popup.cpp
-    ui/editor/brush_preview.cpp
-    ui/editor/delayed_mouse_move.cpp
-    ui/editor/dragging_value_state.cpp
-    ui/editor/drawing_state.cpp
-    ui/editor/editor.cpp
-    ui/editor/editor_observers.cpp
-    ui/editor/editor_render.cpp
-    ui/editor/editor_states_history.cpp
-    ui/editor/editor_view.cpp
-    ui/editor/moving_cel_state.cpp
-    ui/editor/moving_pixels_state.cpp
-    ui/editor/moving_selection_state.cpp
-    ui/editor/moving_slice_state.cpp
-    ui/editor/moving_symmetry_state.cpp
-    ui/editor/navigate_state.cpp
-    ui/editor/pivot_helpers.cpp
-    ui/editor/pixels_movement.cpp
-    ui/editor/play_state.cpp
-    ui/editor/scrolling_state.cpp
-    ui/editor/select_box_state.cpp
-    ui/editor/standby_state.cpp
-    ui/editor/state_with_wheel_behavior.cpp
-    ui/editor/transform_handles.cpp
-    ui/editor/zooming_state.cpp
-    ui/export_file_window.cpp
-    ui/expr_entry.cpp
-    ui/file_list.cpp
-    ui/file_list_view.cpp
-    ui/file_selector.cpp
-    ui/filename_field.cpp
-    ui/font_popup.cpp
-    ui/hex_color_entry.cpp
-    ui/home_view.cpp
-    ui/icon_button.cpp
-    ui/incompat_file_window.cpp
-    ui/input_chain.cpp
-    ui/keyboard_shortcuts.cpp
-    ui/main_menu_bar.cpp
-    ui/main_window.cpp
-    ui/mini_help_button.cpp
-    ui/notifications.cpp
-    ui/optional_alert.cpp
-    ui/palette_popup.cpp
-    ui/palette_view.cpp
-    ui/palettes_listbox.cpp
-    ui/popup_window_pin.cpp
-    ui/pref_widget.cpp
-    ui/preview_editor.cpp
-    ui/recent_listbox.cpp
-    ui/resources_listbox.cpp
-    ui/rgbmap_algorithm_selector.cpp
-    ui/sampling_selector.cpp
-    ui/search_entry.cpp
-    ui/select_accelerator.cpp
-    ui/selection_mode_field.cpp
-    ui/skin/font_data.cpp
-    ui/skin/skin_part.cpp
-    ui/skin/skin_property.cpp
-    ui/skin/skin_slider_property.cpp
-    ui/skin/skin_theme.cpp
-    ui/slice_window.cpp
-    ui/slider2.cpp
-    ui/status_bar.cpp
-    ui/tabs.cpp
-    ui/tag_window.cpp
-    ui/task_widget.cpp
-    ui/tile_button.cpp
-    ui/tileset_selector.cpp
-    ui/timeline/ani_controls.cpp
-    ui/timeline/timeline.cpp
-    ui/toolbar.cpp
-    ui/user_data_view.cpp
-    ui/workspace.cpp
-    ui/workspace_panel.cpp
-    ui/workspace_tabs.cpp
-    ui/zoom_entry.cpp
-    ui_context.cpp
-    widget_loader.cpp)
-  if(ENABLE_NEWS)
-    target_compile_definitions(app-lib PUBLIC -DENABLE_NEWS)
-    target_sources(app-lib PRIVATE
-      res/http_loader.cpp
-      ui/news_listbox.cpp)
-  endif()
-  if(ENABLE_DRM)
-    target_link_libraries(app-lib drm-lib)
-    target_compile_definitions(app-lib PUBLIC
-      -DENABLE_DRM
-      -DENABLE_SAVE)
-    target_sources(app-lib PRIVATE
-      ui/enter_license.cpp
-      ui/aseprite_update.cpp)
-  endif()
+    shell.cpp
+    ui/devconsole_view.cpp)
 endif()

 # Main app sources
 target_sources(app-lib PRIVATE
  active_site_handler.cpp
  app.cpp
+  app_brushes.cpp
+  app_menus.cpp
  check_update.cpp
  cli/app_options.cpp
  cli/cli_open_file.cpp
  cli/cli_processor.cpp
  cli/default_cli_delegate.cpp
  cli/preview_cli_delegate.cpp
+  closed_docs.cpp
  cmd.cpp
  cmd/add_cel.cpp
  cmd/add_frame.cpp
@ -589,33 +362,127 @@ target_sources(app-lib PRIVATE
  color_picker.cpp
  color_spaces.cpp
  color_utils.cpp
+  commands/cmd_about.cpp
  commands/cmd_add_color.cpp
+  commands/cmd_advanced_mode.cpp
  commands/cmd_background_from_layer.cpp
+  commands/cmd_cancel.cpp
  commands/cmd_canvas_size.cpp
  commands/cmd_cel_opacity.cpp
+  commands/cmd_cel_properties.cpp
+  commands/cmd_change_brush.cpp
+  commands/cmd_change_color.cpp
  commands/cmd_change_pixel_format.cpp
+  commands/cmd_clear.cpp
+  commands/cmd_clear_cel.cpp
+  commands/cmd_clear_recent_files.cpp
+  commands/cmd_close_file.cpp
  commands/cmd_color_quantization.cpp
+  commands/cmd_contiguous_fill.cpp
+  commands/cmd_copy.cpp
+  commands/cmd_copy_cel.cpp
+  commands/cmd_copy_merged.cpp
  commands/cmd_crop.cpp
+  commands/cmd_cut.cpp
  commands/cmd_deselect_mask.cpp
+  commands/cmd_discard_brush.cpp
+  commands/cmd_duplicate_layer.cpp
+  commands/cmd_duplicate_sprite.cpp
+  commands/cmd_duplicate_view.cpp
+  commands/cmd_enter_license.cpp
+  commands/cmd_exit.cpp
  commands/cmd_export_sprite_sheet.cpp
+  commands/cmd_eyedropper.cpp
  commands/cmd_fill_and_stroke.cpp
+  commands/cmd_fit_screen.cpp
  commands/cmd_flatten_layers.cpp
  commands/cmd_flip.cpp
+  commands/cmd_frame_properties.cpp
+  commands/cmd_frame_tag_properties.cpp
+  commands/cmd_fullscreen_mode.cpp
+  commands/cmd_fullscreen_preview.cpp
+  commands/cmd_goto_frame.cpp
+  commands/cmd_goto_layer.cpp
+  commands/cmd_goto_tab.cpp
+  commands/cmd_grid.cpp
+  commands/cmd_home.cpp
  commands/cmd_import_sprite_sheet.cpp
+  commands/cmd_invert_mask.cpp
+  commands/cmd_keyboard_shortcuts.cpp
+  commands/cmd_launch.cpp
  commands/cmd_layer_from_background.cpp
+  commands/cmd_layer_lock.cpp
+  commands/cmd_layer_opacity.cpp
+  commands/cmd_layer_properties.cpp
+  commands/cmd_layer_visibility.cpp
+  commands/cmd_link_cels.cpp
+  commands/cmd_load_mask.cpp
  commands/cmd_load_palette.cpp
  commands/cmd_mask_all.cpp
+  commands/cmd_mask_by_color.cpp
+  commands/cmd_mask_content.cpp
  commands/cmd_merge_down_layer.cpp
+  commands/cmd_modify_selection.cpp
+  commands/cmd_move_cel.cpp
+  commands/cmd_move_mask.cpp
+  commands/cmd_new_brush.cpp
  commands/cmd_new_file.cpp
  commands/cmd_new_frame.cpp
+  commands/cmd_new_frame_tag.cpp
  commands/cmd_new_layer.cpp
+  commands/cmd_new_sprite_from_selection.cpp
+  commands/cmd_onionskin.cpp
+  commands/cmd_open_browser.cpp
  commands/cmd_open_file.cpp
+  commands/cmd_open_group.cpp
+  commands/cmd_open_in_folder.cpp
+  commands/cmd_open_with_app.cpp
+  commands/cmd_options.cpp
+  commands/cmd_palette_editor.cpp
  commands/cmd_palette_size.cpp
+  commands/cmd_paste.cpp
+  commands/cmd_paste_text.cpp
+  commands/cmd_pixel_perfect_mode.cpp
+  commands/cmd_play_animation.cpp
+  commands/cmd_refresh.cpp
+  commands/cmd_remove_frame.cpp
+  commands/cmd_remove_frame_tag.cpp
  commands/cmd_remove_layer.cpp
+  commands/cmd_remove_slice.cpp
+  commands/cmd_reopen_closed_file.cpp
+  commands/cmd_repeat_last_export.cpp
+  commands/cmd_reselect_mask.cpp
+  commands/cmd_reverse_frames.cpp
+  commands/cmd_rotate.cpp
  commands/cmd_save_file.cpp
+  commands/cmd_save_mask.cpp
+  commands/cmd_save_palette.cpp
+  commands/cmd_scroll.cpp
+  commands/cmd_scroll_center.cpp
+  commands/cmd_select_palette.cpp
+  commands/cmd_select_tile.cpp
+  commands/cmd_set_color_selector.cpp
+  commands/cmd_set_ink_type.cpp
+  commands/cmd_set_loop_section.cpp
+  commands/cmd_set_palette.cpp
+  commands/cmd_set_palette_entry_size.cpp
+  commands/cmd_set_same_ink.cpp
  commands/cmd_show.cpp
+  commands/cmd_slice_properties.cpp
+  commands/cmd_sprite_properties.cpp
  commands/cmd_sprite_size.cpp
+  commands/cmd_swap_checkerboard_colors.cpp
+  commands/cmd_switch_colors.cpp
+  commands/cmd_symmetry_mode.cpp
+  commands/cmd_tiled_mode.cpp
+  commands/cmd_timeline.cpp
+  commands/cmd_toggle_preview.cpp
+  commands/cmd_toggle_tiles_mode.cpp
+  commands/cmd_toggle_timeline_thumbnails.cpp
  commands/cmd_undo.cpp
+  commands/cmd_undo_history.cpp
+  commands/cmd_unlink_cel.cpp
+  commands/cmd_zoom.cpp
  commands/command.cpp
  commands/commands.cpp
  commands/convert_layer.cpp
@ -632,12 +499,21 @@ target_sources(app-lib PRIVATE
  commands/filters/color_curve_editor.cpp
  commands/filters/convolution_matrix_stock.cpp
  commands/filters/filter_manager_impl.cpp
+  commands/filters/filter_preview.cpp
+  commands/filters/filter_target_buttons.cpp
+  commands/filters/filter_window.cpp
  commands/filters/filter_worker.cpp
  commands/move_colors_command.cpp
  commands/move_thing.cpp
  commands/move_tiles_command.cpp
  commands/new_params.cpp
  commands/quick_command.cpp
+  commands/screenshot.cpp
+  commands/set_playback_speed.cpp
+  commands/show_menu.cpp
+  commands/tileset_mode.cpp
+  commands/toggle_other_layers_opacity.cpp
+  commands/toggle_play_option.cpp
  console.cpp
  context.cpp
  context_flags.cpp
@ -658,6 +534,7 @@ target_sources(app-lib PRIVATE
  file/file_op_config.cpp
  file/palette_file.cpp
  file/split_filename.cpp
+  file_selector.cpp
  file_system.cpp
  filename_formatter.cpp
  flatten.cpp
@ -672,6 +549,8 @@ target_sources(app-lib PRIVATE
  log.cpp
  loop_tag.cpp
  modules.cpp
+  modules/gfx.cpp
+  modules/gui.cpp
  modules/palettes.cpp
  pref/preferences.cpp
  recent_files.cpp
@ -700,8 +579,107 @@ target_sources(app-lib PRIVATE
  tools/velocity.cpp
  transaction.cpp
  transformation.cpp
+  ui/alpha_entry.cpp
+  ui/alpha_slider.cpp
+  ui/app_menuitem.cpp
+  ui/backup_indicator.cpp
+  ui/browser_view.cpp
+  ui/brush_popup.cpp
+  ui/button_set.cpp
+  ui/color_bar.cpp
+  ui/color_button.cpp
+  ui/color_popup.cpp
+  ui/color_selector.cpp
+  ui/color_shades.cpp
+  ui/color_sliders.cpp
+  ui/color_spectrum.cpp
+  ui/color_tint_shade_tone.cpp
+  ui/color_wheel.cpp
+  ui/configure_timeline_popup.cpp
+  ui/context_bar.cpp
+  ui/dithering_selector.cpp
+  ui/doc_view.cpp
+  ui/drop_down_button.cpp
+  ui/dynamics_popup.cpp
+  ui/editor/brush_preview.cpp
+  ui/editor/delayed_mouse_move.cpp
+  ui/editor/dragging_value_state.cpp
+  ui/editor/drawing_state.cpp
+  ui/editor/editor.cpp
+  ui/editor/editor_observers.cpp
+  ui/editor/editor_render.cpp
+  ui/editor/editor_states_history.cpp
+  ui/editor/editor_view.cpp
+  ui/editor/moving_cel_state.cpp
+  ui/editor/moving_pixels_state.cpp
+  ui/editor/moving_selection_state.cpp
+  ui/editor/moving_slice_state.cpp
+  ui/editor/moving_symmetry_state.cpp
+  ui/editor/navigate_state.cpp
+  ui/editor/pivot_helpers.cpp
+  ui/editor/pixels_movement.cpp
+  ui/editor/play_state.cpp
+  ui/editor/scrolling_state.cpp
+  ui/editor/select_box_state.cpp
+  ui/editor/standby_state.cpp
+  ui/editor/state_with_wheel_behavior.cpp
  ui/editor/tool_loop_impl.cpp
+  ui/editor/transform_handles.cpp
+  ui/editor/zooming_state.cpp
+  ui/export_file_window.cpp
+  ui/expr_entry.cpp
+  ui/file_list.cpp
+  ui/file_list_view.cpp
+  ui/file_selector.cpp
+  ui/filename_field.cpp
+  ui/font_popup.cpp
+  ui/hex_color_entry.cpp
+  ui/home_view.cpp
+  ui/icon_button.cpp
+  ui/incompat_file_window.cpp
+  ui/input_chain.cpp
+  ui/keyboard_shortcuts.cpp
  ui/layer_frame_comboboxes.cpp
+  ui/main_menu_bar.cpp
+  ui/main_window.cpp
+  ui/mini_help_button.cpp
+  ui/notifications.cpp
+  ui/optional_alert.cpp
+  ui/palette_popup.cpp
+  ui/palette_view.cpp
+  ui/palettes_listbox.cpp
+  ui/popup_window_pin.cpp
+  ui/pref_widget.cpp
+  ui/preview_editor.cpp
+  ui/recent_listbox.cpp
+  ui/resources_listbox.cpp
+  ui/rgbmap_algorithm_selector.cpp
+  ui/sampling_selector.cpp
+  ui/search_entry.cpp
+  ui/select_accelerator.cpp
+  ui/selection_mode_field.cpp
+  ui/skin/font_data.cpp
+  ui/skin/skin_part.cpp
+  ui/skin/skin_property.cpp
+  ui/skin/skin_slider_property.cpp
+  ui/skin/skin_theme.cpp
+  ui/slice_window.cpp
+  ui/slider2.cpp
+  ui/status_bar.cpp
+  ui/tabs.cpp
+  ui/tag_window.cpp
+  ui/task_widget.cpp
+  ui/tile_button.cpp
+  ui/tileset_selector.cpp
+  ui/timeline/ani_controls.cpp
+  ui/timeline/timeline.cpp
+  ui/toolbar.cpp
+  ui/user_data_view.cpp
+  ui/workspace.cpp
+  ui/workspace_panel.cpp
+  ui/workspace_tabs.cpp
+  ui/zoom_entry.cpp
+  ui_context.cpp
  util/autocrop.cpp
  util/buffer_region.cpp
  util/cel_ops.cpp
@ -725,6 +703,7 @@ target_sources(app-lib PRIVATE
  util/tile_flags_utils.cpp
  util/tileset_utils.cpp
  util/wrap_point.cpp
+  widget_loader.cpp
  xml_document.cpp
  xml_exception.cpp)

@ -732,6 +711,23 @@ if(TARGET generated_version)
  add_dependencies(app-lib generated_version)
 endif()

+if(ENABLE_NEWS)
+  target_compile_definitions(app-lib PUBLIC -DENABLE_NEWS)
+  target_sources(app-lib PRIVATE
+    res/http_loader.cpp
+    ui/news_listbox.cpp)
+endif()
+
+if(ENABLE_DRM)
+  target_link_libraries(app-lib drm-lib)
+  target_compile_definitions(app-lib PUBLIC
+    -DENABLE_DRM
+    -DENABLE_SAVE)
+  target_sources(app-lib PRIVATE
+    ui/enter_license.cpp
+    ui/aseprite_update.cpp)
+endif()
+
 target_link_libraries(app-lib
  laf-base
  cfg-lib