Yaft: Move to yaft2, remove legacy yaft

timower · Nov 27, 2023 · 2c826ae · 2c826ae
1 parent 93c8b98
commit 2c826ae
Show file tree

Hide file tree

Showing 26 changed files with 430 additions and 2,120 deletions.
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_subdirectory(tilem)
 add_subdirectory(rocket)
 add_subdirectory(yaft)
-add_subdirectory(yaft2)
 
 add_custom_target(apps)
-add_dependencies(apps tilem yaft rocket yaft2)
+add_dependencies(apps tilem yaft rocket)
diff --git a/apps/yaft/CMakeLists.txt b/apps/yaft/CMakeLists.txt
@@ -1,21 +1,28 @@
 project(yaft)
 
-add_executable(${PROJECT_NAME}
-  main.cpp
-  fb/common.cpp
-  keyboard.cpp)
+add_library(yaft_app_lib OBJECT
+  YaftWidget.cpp keyboard.cpp screen.cpp layout.cpp keymap.cpp config.cpp)
+add_library(Yaft::app_lib ALIAS yaft_app_lib)
 
-target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
+target_include_directories(yaft_app_lib PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 
-target_link_libraries(${PROJECT_NAME}
-  PRIVATE
+target_link_libraries(yaft_app_lib PUBLIC
     rMlib
-    libYaft)
+    libYaft
+    util
+    tomlplusplus::tomlplusplus)
 
 if (APPLE)
-  target_link_libraries(${PROJECT_NAME} PRIVATE linux::mxcfb)
+  target_link_libraries(yaft_app_lib PUBLIC linux::mxcfb)
 endif()
 
+add_executable(${PROJECT_NAME} main.cpp)
+
+target_link_libraries(${PROJECT_NAME}
+  PRIVATE
+    yaft_app_lib
+    rMlib)
+
 install(TARGETS ${PROJECT_NAME}
   COMPONENT ${PROJECT_NAME}
   DESTINATION opt/bin)

diff --git a/apps/yaft2/YaftWidget.cpp → apps/yaft/YaftWidget.cpp b/apps/yaft2/YaftWidget.cpp → apps/yaft/YaftWidget.cpp
diff --git a/apps/yaft2/YaftWidget.h → apps/yaft/YaftWidget.h b/apps/yaft2/YaftWidget.h → apps/yaft/YaftWidget.h
diff --git a/apps/yaft2/config.cpp → apps/yaft/config.cpp b/apps/yaft2/config.cpp → apps/yaft/config.cpp
diff --git a/apps/yaft2/config.h → apps/yaft/config.h b/apps/yaft2/config.h → apps/yaft/config.h
diff --git a/apps/yaft/fb/common.cpp b/apps/yaft/fb/common.cpp
diff --git a/apps/yaft/fb/common.h b/apps/yaft/fb/common.h