Merged new folder structure

mauer · Mar 2, 2024 · 25d5636 · 25d5636
1 parent 0da01c9
commit 25d5636
Show file tree

Hide file tree

Showing 115 changed files with 145 additions and 191 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -78,9 +78,6 @@ endif()
 # add external libraries
 add_subdirectory(external)
 
-# Add libraries
-add_subdirectory(lib)
-
 # Add plugin
 add_subdirectory(src)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------------------------------------------------
 #   XMidiCtrl - MIDI Controller plugin for X-Plane
 #
-#   Copyright (c) 2021-2023 Marco Auer
+#   Copyright (c) 2021-2024 Marco Auer
 #
 #   XMidiCtrl is free software: you can redistribute it and/or modify it under the terms of the
 #   GNU Affero General Public License as published by the Free Software Foundation, either version 3
@@ -15,78 +15,10 @@
 #   If not, see <https://www.gnu.org/licenses/>.
 #----------------------------------------------------------------------------------------------------------------------
 
-message("-- Configuring build scripts for ${PROJECT_NAME}")
-
 set(CMAKE_CXX_STANDARD 20)
 
-# Include fonts
-include_directories(${FONTS_INCLUDEDIR})
-
-# Include the ImGui files
-include_directories(${IMGUI_INCLUDEDIR})
-
-# Build shared library
-add_library(${PROJECT_NAME} SHARED)
-
 # Include sub directories
-add_subdirectory(profile)
-
-include(${CMAKE_CURRENT_LIST_DIR}/ui/CMakeLists.txt)
-include(${CMAKE_CURRENT_LIST_DIR}/plugin/CMakeLists.txt)
-
-# Apple deprecated OpenGL...yea, we know, keep quiet
-if (APPLE)
-    set_source_files_properties(
-            ${CMAKE_CURRENT_LIST_DIR}/ui/ImgFontAtlas.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/ui/imgui_window.cpp
-        PROPERTIES
-            COMPILE_OPTIONS "-Wno-deprecated-declarations")
-endif()
-
-# add static libraries for xmidictrl
-target_link_libraries(${PROJECT_NAME} xmidictrl-common xmidictrl-env xmidictrl-map xmidictrl-profile)
-
-# link required dependencies
-if (WIN32)
-    message("Build for Windows Platform")
-    if (MINGW)
-        target_link_libraries(${PROJECT_NAME} mingw_stdthreads)
-    endif()
-    if (MSVC)
-        target_link_libraries(${PROJECT_NAME} toml11 fmt::fmt-header-only rtmidi hidapi::hidapi winmm xpsdk imgui)
-        include(GenerateExportHeader)
-        generate_export_header(${PROJECT_NAME})
-        add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            $<TARGET_FILE:${PROJECT_NAME}> "${PROJECT_SOURCE_DIR}/package/${PROJECT_NAME}/win_x64/$<TARGET_FILE_NAME:${PROJECT_NAME}>"
-        )
-    else()
-        target_link_libraries(${PROJECT_NAME} -s -static -static-libgcc -static-libstdc++ toml11 fmt::fmt-header-only rtmidi hidapi::hidapi winmm xpsdk imgui)
-        set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/package/${PROJECT_NAME}/win_x64")
-    endif()
-elseif (APPLE)
-    message("Build for Apple Platform")
-    find_library(CORE_FOUNDATION_LIBRARY CoreFoundation REQUIRED)
-    find_library(Cocoa_LIBRARY Cocoa REQUIRED)
-    find_library(Security_LIBRARY Security REQUIRED)
-    find_library(GSS_LIBRARY GSS REQUIRED)
-    find_library(OpenGL_LIBRARY OpenGL REQUIRED)
-    # Link OS X core system libraries.
-    target_link_libraries(${PROJECT_NAME} ${CORE_FOUNDATION_LIBRARY} ${Cocoa_LIBRARY} ${Security_LIBRARY} ${GSS_LIBRARY} ${OpenGL_LIBRARY})
-    target_link_libraries(${PROJECT_NAME} toml11 fmt::fmt-header-only rtmidi hidapi::hidapi xpsdk imgui)
-    target_link_options(${PROJECT_NAME} PRIVATE "-Wl,-no_weak_imports")
-
-    # Restrict set of symbols exported from the plugin to the ones required by XPLM:
-    # target_link_options(${PROJECT_NAME} PRIVATE "-exported_symbols_list ${CMAKE_SOURCE_DIR}/src/xmidictrl.sym_mac")
-    set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/package/${PROJECT_NAME}/mac_x64")
-elseif (UNIX)
-    message("Build for Linux Platform")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/package/${PROJECT_NAME}/lin_64")
-    target_link_libraries(${PROJECT_NAME} -static-libgcc -static-libstdc++ -fPIC toml11 fmt::fmt-header-only rtmidi hidapi::hidapi xpsdk imgui)
-    set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/package/${PROJECT_NAME}/lin_x64")
-endif ()
-
-# Set output properties for X-Plane standards
-set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
-set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".xpl")
+add_subdirectory(common)
+add_subdirectory(env)
+add_subdirectory(device)
+add_subdirectory(plugin)
diff --git a/lib/common/CMakeLists.txt → src/common/CMakeLists.txt b/lib/common/CMakeLists.txt → src/common/CMakeLists.txt
diff --git a/lib/common/device_settings.h → src/common/device_settings.h b/lib/common/device_settings.h → src/common/device_settings.h
diff --git a/lib/common/hid.cpp → src/common/hid.cpp b/lib/common/hid.cpp → src/common/hid.cpp
diff --git a/lib/common/hid.h → src/common/hid.h b/lib/common/hid.h → src/common/hid.h
diff --git a/lib/common/hid_event.h → src/common/hid_event.h b/lib/common/hid_event.h → src/common/hid_event.h
diff --git a/lib/common/hid_logger.cpp → src/common/hid_logger.cpp b/lib/common/hid_logger.cpp → src/common/hid_logger.cpp
diff --git a/lib/common/hid_logger.h → src/common/hid_logger.h b/lib/common/hid_logger.h → src/common/hid_logger.h
diff --git a/lib/common/map.cpp → src/common/map.cpp b/lib/common/map.cpp → src/common/map.cpp
diff --git a/lib/common/map.h → src/common/map.h b/lib/common/map.h → src/common/map.h
diff --git a/lib/common/map_param.cpp → src/common/map_param.cpp b/lib/common/map_param.cpp → src/common/map_param.cpp
diff --git a/lib/common/map_param.h → src/common/map_param.h b/lib/common/map_param.h → src/common/map_param.h
diff --git a/lib/common/map_param_in.cpp → src/common/map_param_in.cpp b/lib/common/map_param_in.cpp → src/common/map_param_in.cpp
diff --git a/lib/common/map_param_in.h → src/common/map_param_in.h b/lib/common/map_param_in.h → src/common/map_param_in.h
diff --git a/lib/common/map_param_out.cpp → src/common/map_param_out.cpp b/lib/common/map_param_out.cpp → src/common/map_param_out.cpp
diff --git a/lib/common/map_param_out.h → src/common/map_param_out.h b/lib/common/map_param_out.h → src/common/map_param_out.h
diff --git a/lib/common/map_result.h → src/common/map_result.h b/lib/common/map_result.h → src/common/map_result.h
diff --git a/lib/common/midi_logger.cpp → src/common/midi_logger.cpp b/lib/common/midi_logger.cpp → src/common/midi_logger.cpp
diff --git a/lib/common/midi_logger.h → src/common/midi_logger.h b/lib/common/midi_logger.h → src/common/midi_logger.h
diff --git a/lib/common/midi_message.cpp → src/common/midi_message.cpp b/lib/common/midi_message.cpp → src/common/midi_message.cpp
diff --git a/lib/common/midi_message.h → src/common/midi_message.h b/lib/common/midi_message.h → src/common/midi_message.h
diff --git a/lib/common/outbound_task.h → src/common/outbound_task.h b/lib/common/outbound_task.h → src/common/outbound_task.h
diff --git a/lib/common/text_log_msg.h → src/common/text_log_msg.h b/lib/common/text_log_msg.h → src/common/text_log_msg.h
diff --git a/lib/common/text_logger.cpp → src/common/text_logger.cpp b/lib/common/text_logger.cpp → src/common/text_logger.cpp
diff --git a/lib/common/text_logger.h → src/common/text_logger.h b/lib/common/text_logger.h → src/common/text_logger.h
diff --git a/lib/common/toml_utils.cpp → src/common/toml_utils.cpp b/lib/common/toml_utils.cpp → src/common/toml_utils.cpp
diff --git a/lib/common/toml_utils.h → src/common/toml_utils.h b/lib/common/toml_utils.h → src/common/toml_utils.h
diff --git a/lib/common/types.h → src/common/types.h b/lib/common/types.h → src/common/types.h
diff --git a/lib/common/utils.cpp → src/common/utils.cpp b/lib/common/utils.cpp → src/common/utils.cpp
diff --git a/lib/common/utils.h → src/common/utils.h b/lib/common/utils.h → src/common/utils.h
diff --git a/lib/map/CMakeLists.txt → src/device/CMakeLists.txt b/lib/map/CMakeLists.txt → src/device/CMakeLists.txt
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------------------------------------------------
 #   XMidiCtrl - MIDI Controller plugin for X-Plane
 #
-#   Copyright (c) 2021-2023 Marco Auer
+#   Copyright (c) 2021-2024 Marco Auer
 #
 #   XMidiCtrl is free software: you can redistribute it and/or modify it under the terms of the
 #   GNU Affero General Public License as published by the Free Software Foundation, either version 3
@@ -20,15 +20,19 @@
 cmake_minimum_required(VERSION 3.16)
 
 # Set project details
-set(XMIDICTRL_LIB_MAP xmidictrl-map)
-project(${XMIDICTRL_LIB_MAP})
+set(XMIDICTRL_LIB_DEV xmidictrl-dev)
+project(${XMIDICTRL_LIB_DEV})
 
-message("-- Configuring build scripts for library ${XMIDICTRL_LIB_MAP}")
-
-message("---- Directory: src/map")
+message("-- Configuring build scripts for library ${XMIDICTRL_LIB_DEV}")
 
 # Add sources
-set(MAP_SRC
+set(DEV_SRC
+        ${CMAKE_CURRENT_LIST_DIR}/conversions.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/device.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/device_list.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/hid_device.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/midi_device.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/virtual_midi_device.cpp
         ${CMAKE_CURRENT_LIST_DIR}/map_init/map_init.cpp
         ${CMAKE_CURRENT_LIST_DIR}/map_in/map_in.cpp
         ${CMAKE_CURRENT_LIST_DIR}/map_in/map_in_cmd.cpp
@@ -48,18 +52,11 @@ set(MAP_SRC
         )
 
 # Build static library
-add_library(${XMIDICTRL_LIB_MAP} STATIC ${MAP_SRC})
-add_library(${XMIDICTRL_LIB_MAP}-tests STATIC ${MAP_SRC})
-
-target_link_libraries(${XMIDICTRL_LIB_MAP} PUBLIC toml11 fmt::fmt-header-only xmidictrl-common xmidictrl-env)
-target_link_libraries(${XMIDICTRL_LIB_MAP}-tests PUBLIC toml11 fmt::fmt-header-only xmidictrl-common xmidictrl-env-tests)
+add_library(${XMIDICTRL_LIB_DEV} STATIC ${DEV_SRC})
 
-target_include_directories(${XMIDICTRL_LIB_MAP} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_include_directories(${XMIDICTRL_LIB_MAP} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/map_init)
-target_include_directories(${XMIDICTRL_LIB_MAP} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/map_in)
-target_include_directories(${XMIDICTRL_LIB_MAP} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/map_out)
+target_link_libraries(${XMIDICTRL_LIB_DEV} PUBLIC toml11 fmt::fmt-header-only rtmidi xmidictrl-common xmidictrl-env)
 
-target_include_directories(${XMIDICTRL_LIB_MAP}-tests PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_include_directories(${XMIDICTRL_LIB_MAP}-tests PUBLIC ${CMAKE_CURRENT_LIST_DIR}/map_init)
-target_include_directories(${XMIDICTRL_LIB_MAP}-tests PUBLIC ${CMAKE_CURRENT_LIST_DIR}/map_in)
-target_include_directories(${XMIDICTRL_LIB_MAP}-tests PUBLIC ${CMAKE_CURRENT_LIST_DIR}/map_out)
+target_include_directories(${XMIDICTRL_LIB_DEV} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(${XMIDICTRL_LIB_DEV} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/map_init)
+target_include_directories(${XMIDICTRL_LIB_DEV} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/map_in)
+target_include_directories(${XMIDICTRL_LIB_DEV} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/map_out)
diff --git a/src/profile/conversions.cpp → src/device/conversions.cpp b/src/profile/conversions.cpp → src/device/conversions.cpp
diff --git a/src/profile/conversions.h → src/device/conversions.h b/src/profile/conversions.h → src/device/conversions.h
diff --git a/src/profile/device.cpp → src/device/device.cpp b/src/profile/device.cpp → src/device/device.cpp
diff --git a/src/profile/device.h → src/device/device.h b/src/profile/device.h → src/device/device.h
diff --git a/src/profile/device_list.cpp → src/device/device_list.cpp b/src/profile/device_list.cpp → src/device/device_list.cpp
diff --git a/src/profile/device_list.h → src/device/device_list.h b/src/profile/device_list.h → src/device/device_list.h
diff --git a/src/profile/hid_device.cpp → src/device/hid_device.cpp b/src/profile/hid_device.cpp → src/device/hid_device.cpp
diff --git a/src/profile/hid_device.h → src/device/hid_device.h b/src/profile/hid_device.h → src/device/hid_device.h
diff --git a/lib/map/map_in/CMakeLists.txt → src/device/map_in/CMakeLists.txt b/lib/map/map_in/CMakeLists.txt → src/device/map_in/CMakeLists.txt
diff --git a/lib/map/map_in/label.h → src/device/map_in/label.h b/lib/map/map_in/label.h → src/device/map_in/label.h
diff --git a/lib/map/map_in/map_in.cpp → src/device/map_in/map_in.cpp b/lib/map/map_in/map_in.cpp → src/device/map_in/map_in.cpp
diff --git a/lib/map/map_in/map_in.h → src/device/map_in/map_in.h b/lib/map/map_in/map_in.h → src/device/map_in/map_in.h
diff --git a/lib/map/map_in/map_in_cmd.cpp → src/device/map_in/map_in_cmd.cpp b/lib/map/map_in/map_in_cmd.cpp → src/device/map_in/map_in_cmd.cpp
diff --git a/lib/map/map_in/map_in_cmd.h → src/device/map_in/map_in_cmd.h b/lib/map/map_in/map_in_cmd.h → src/device/map_in/map_in_cmd.h
diff --git a/lib/map/map_in/map_in_drf.cpp → src/device/map_in/map_in_drf.cpp b/lib/map/map_in/map_in_drf.cpp → src/device/map_in/map_in_drf.cpp
diff --git a/lib/map/map_in/map_in_drf.h → src/device/map_in/map_in_drf.h b/lib/map/map_in/map_in_drf.h → src/device/map_in/map_in_drf.h
diff --git a/lib/map/map_in/map_in_enc.cpp → src/device/map_in/map_in_enc.cpp b/lib/map/map_in/map_in_enc.cpp → src/device/map_in/map_in_enc.cpp
diff --git a/lib/map/map_in/map_in_enc.h → src/device/map_in/map_in_enc.h b/lib/map/map_in/map_in_enc.h → src/device/map_in/map_in_enc.h
diff --git a/lib/map/map_in/map_in_label.cpp → src/device/map_in/map_in_label.cpp b/lib/map/map_in/map_in_label.cpp → src/device/map_in/map_in_label.cpp
diff --git a/lib/map/map_in/map_in_label.h → src/device/map_in/map_in_label.h b/lib/map/map_in/map_in_label.h → src/device/map_in/map_in_label.h
diff --git a/lib/map/map_in/map_in_list.cpp → src/device/map_in/map_in_list.cpp b/lib/map/map_in/map_in_list.cpp → src/device/map_in/map_in_list.cpp
diff --git a/lib/map/map_in/map_in_list.h → src/device/map_in/map_in_list.h b/lib/map/map_in/map_in_list.h → src/device/map_in/map_in_list.h
diff --git a/lib/map/map_in/map_in_pnp.cpp → src/device/map_in/map_in_pnp.cpp b/lib/map/map_in/map_in_pnp.cpp → src/device/map_in/map_in_pnp.cpp
diff --git a/lib/map/map_in/map_in_pnp.h → src/device/map_in/map_in_pnp.h b/lib/map/map_in/map_in_pnp.h → src/device/map_in/map_in_pnp.h
diff --git a/lib/map/map_in/map_in_sld.cpp → src/device/map_in/map_in_sld.cpp b/lib/map/map_in/map_in_sld.cpp → src/device/map_in/map_in_sld.cpp
diff --git a/lib/map/map_in/map_in_sld.h → src/device/map_in/map_in_sld.h b/lib/map/map_in/map_in_sld.h → src/device/map_in/map_in_sld.h
diff --git a/lib/map/map_init/CMakeLists.txt → src/device/map_init/CMakeLists.txt b/lib/map/map_init/CMakeLists.txt → src/device/map_init/CMakeLists.txt
diff --git a/lib/map/map_init/map_init.cpp → src/device/map_init/map_init.cpp b/lib/map/map_init/map_init.cpp → src/device/map_init/map_init.cpp
diff --git a/lib/map/map_init/map_init.h → src/device/map_init/map_init.h b/lib/map/map_init/map_init.h → src/device/map_init/map_init.h
diff --git a/lib/map/map_init/map_init_list.cpp → src/device/map_init/map_init_list.cpp b/lib/map/map_init/map_init_list.cpp → src/device/map_init/map_init_list.cpp
diff --git a/lib/map/map_init/map_init_list.h → src/device/map_init/map_init_list.h b/lib/map/map_init/map_init_list.h → src/device/map_init/map_init_list.h
diff --git a/lib/map/map_out/CMakeLists.txt → src/device/map_out/CMakeLists.txt b/lib/map/map_out/CMakeLists.txt → src/device/map_out/CMakeLists.txt
diff --git a/lib/map/map_out/map_out.cpp → src/device/map_out/map_out.cpp b/lib/map/map_out/map_out.cpp → src/device/map_out/map_out.cpp
diff --git a/lib/map/map_out/map_out.h → src/device/map_out/map_out.h b/lib/map/map_out/map_out.h → src/device/map_out/map_out.h
diff --git a/lib/map/map_out/map_out_con.cpp → src/device/map_out/map_out_con.cpp b/lib/map/map_out/map_out_con.cpp → src/device/map_out/map_out_con.cpp
diff --git a/lib/map/map_out/map_out_con.h → src/device/map_out/map_out_con.h b/lib/map/map_out/map_out_con.h → src/device/map_out/map_out_con.h
diff --git a/lib/map/map_out/map_out_drf.cpp → src/device/map_out/map_out_drf.cpp b/lib/map/map_out/map_out_drf.cpp → src/device/map_out/map_out_drf.cpp
diff --git a/lib/map/map_out/map_out_drf.h → src/device/map_out/map_out_drf.h b/lib/map/map_out/map_out_drf.h → src/device/map_out/map_out_drf.h
diff --git a/lib/map/map_out/map_out_list.cpp → src/device/map_out/map_out_list.cpp b/lib/map/map_out/map_out_list.cpp → src/device/map_out/map_out_list.cpp
diff --git a/lib/map/map_out/map_out_list.h → src/device/map_out/map_out_list.h b/lib/map/map_out/map_out_list.h → src/device/map_out/map_out_list.h
diff --git a/lib/map/map_out/map_out_sld.cpp → src/device/map_out/map_out_sld.cpp b/lib/map/map_out/map_out_sld.cpp → src/device/map_out/map_out_sld.cpp
diff --git a/lib/map/map_out/map_out_sld.h → src/device/map_out/map_out_sld.h b/lib/map/map_out/map_out_sld.h → src/device/map_out/map_out_sld.h
diff --git a/src/profile/midi_device.cpp → src/device/midi_device.cpp b/src/profile/midi_device.cpp → src/device/midi_device.cpp
@@ -17,6 +17,7 @@
 
 #include "midi_device.h"
 
+#include <mutex>
 #include <utility>
 
 // XMidiCtrl

diff --git a/src/profile/midi_device.h → src/device/midi_device.h b/src/profile/midi_device.h → src/device/midi_device.h
diff --git a/src/profile/virtual_midi_device.cpp → src/device/virtual_midi_device.cpp b/src/profile/virtual_midi_device.cpp → src/device/virtual_midi_device.cpp
diff --git a/src/profile/virtual_midi_device.h → src/device/virtual_midi_device.h b/src/profile/virtual_midi_device.h → src/device/virtual_midi_device.h
diff --git a/lib/env/CMakeLists.txt → src/env/CMakeLists.txt b/lib/env/CMakeLists.txt → src/env/CMakeLists.txt
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------------------------------------------------
 #   XMidiCtrl - MIDI Controller plugin for X-Plane
 #
-#   Copyright (c) 2021-2023 Marco Auer
+#   Copyright (c) 2021-2024 Marco Auer
 #
 #   XMidiCtrl is free software: you can redistribute it and/or modify it under the terms of the
 #   GNU Affero General Public License as published by the Free Software Foundation, either version 3
@@ -30,33 +30,13 @@ set(ENV_SRC
         ${CMAKE_CURRENT_LIST_DIR}/settings.cpp
         )
 
-set(ENV_SRC_XPLANE
-        ${CMAKE_CURRENT_LIST_DIR}/xplane/cmd_xplane.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/xplane/data_xplane.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/xplane/env_xplane.cpp
-)
-
-set(ENV_SRC_TESTS
-        ${CMAKE_CURRENT_LIST_DIR}/tests/command_tests.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/tests/data_tests.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/tests/env_tests.cpp
-)
-
 # Build static library for X-Plane environment
 add_library(${PROJECT_NAME} STATIC)
 
-target_sources(${PROJECT_NAME} PUBLIC ${ENV_SRC} ${ENV_SRC_XPLANE})
+target_sources(${PROJECT_NAME} PUBLIC ${ENV_SRC})
 target_link_libraries(${PROJECT_NAME} PUBLIC toml11 fmt::fmt-header-only imgui xpsdk xmidictrl-common)
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/xplane)
-
-# Build static library for test environment
-add_library(${PROJECT_NAME}-tests STATIC)
-
-target_sources(${PROJECT_NAME}-tests PUBLIC ${ENV_SRC} ${ENV_SRC_TESTS})
-target_link_libraries(${PROJECT_NAME}-tests PUBLIC toml11 fmt::fmt-header-only xpsdk imgui xmidictrl-common)
 
-target_include_directories(${PROJECT_NAME}-tests PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_include_directories(${PROJECT_NAME}-tests PUBLIC ${CMAKE_CURRENT_LIST_DIR}/tests)
-#target_include_directories(${PROJECT_NAME}-tests PUBLIC ${PROJECT_SOURCE_DIR}/external/xpsdk)
+add_subdirectory(tests)
+add_subdirectory(xplane)
diff --git a/lib/env/commands.h → src/env/commands.h b/lib/env/commands.h → src/env/commands.h
diff --git a/lib/env/data.h → src/env/data.h b/lib/env/data.h → src/env/data.h
diff --git a/lib/env/data_item.h → src/env/data_item.h b/lib/env/data_item.h → src/env/data_item.h
diff --git a/lib/env/environment.cpp → src/env/environment.cpp b/lib/env/environment.cpp → src/env/environment.cpp
diff --git a/lib/env/environment.h → src/env/environment.h b/lib/env/environment.h → src/env/environment.h
diff --git a/lib/env/inbound_task.h → src/env/inbound_task.h b/lib/env/inbound_task.h → src/env/inbound_task.h
diff --git a/lib/env/inbound_worker.cpp → src/env/inbound_worker.cpp b/lib/env/inbound_worker.cpp → src/env/inbound_worker.cpp
diff --git a/lib/env/inbound_worker.h → src/env/inbound_worker.h b/lib/env/inbound_worker.h → src/env/inbound_worker.h
diff --git a/lib/env/info_message.h → src/env/info_message.h b/lib/env/info_message.h → src/env/info_message.h
diff --git a/lib/env/settings.cpp → src/env/settings.cpp b/lib/env/settings.cpp → src/env/settings.cpp
diff --git a/lib/env/settings.h → src/env/settings.h b/lib/env/settings.h → src/env/settings.h
diff --git a/lib/CMakeLists.txt → src/env/tests/CMakeLists.txt b/lib/CMakeLists.txt → src/env/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------------------------------------------------
 #   XMidiCtrl - MIDI Controller plugin for X-Plane
 #
-#   Copyright (c) 2021-2023 Marco Auer
+#   Copyright (c) 2021-2024 Marco Auer
 #
 #   XMidiCtrl is free software: you can redistribute it and/or modify it under the terms of the
 #   GNU Affero General Public License as published by the Free Software Foundation, either version 3
@@ -15,15 +15,28 @@
 #   If not, see <https://www.gnu.org/licenses/>.
 #----------------------------------------------------------------------------------------------------------------------
 
-# Set compiler options
-set(CMAKE_CXX_STANDARD 20)
+# Set required CMake version
+cmake_minimum_required(VERSION 3.16)
 
-# Add toml11 for reading and writing the config files
-message("-- Configuring build scripts for library common")
-add_subdirectory(common)
+# Set project details
+project(xmidictrl-env-tests)
 
-message("-- Configuring build scripts for library environment")
-add_subdirectory(env)
+message("-- Configuring build scripts for library ${PROJECT_NAME}")
 
-message("-- Configuring build scripts for library mapping")
-add_subdirectory(map)
+# Include fonts
+include_directories(${FONTS_INCLUDEDIR})
+
+# Add sources
+set(ENV_SRC_TESTS
+        ${CMAKE_CURRENT_LIST_DIR}/command_tests.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/data_tests.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/env_tests.cpp
+)
+
+# Build static library for X-Plane environment
+add_library(${PROJECT_NAME} STATIC)
+
+target_sources(${PROJECT_NAME} PUBLIC ${ENV_SRC_TESTS})
+target_link_libraries(${PROJECT_NAME} PUBLIC toml11 fmt::fmt-header-only imgui xpsdk xmidictrl-common xmidictrl-env)
+
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
diff --git a/lib/env/tests/command_tests.cpp → src/env/tests/command_tests.cpp b/lib/env/tests/command_tests.cpp → src/env/tests/command_tests.cpp
diff --git a/lib/env/tests/command_tests.h → src/env/tests/command_tests.h b/lib/env/tests/command_tests.h → src/env/tests/command_tests.h
diff --git a/lib/env/tests/data_tests.cpp → src/env/tests/data_tests.cpp b/lib/env/tests/data_tests.cpp → src/env/tests/data_tests.cpp
diff --git a/lib/env/tests/data_tests.h → src/env/tests/data_tests.h b/lib/env/tests/data_tests.h → src/env/tests/data_tests.h
diff --git a/lib/env/tests/env_tests.cpp → src/env/tests/env_tests.cpp b/lib/env/tests/env_tests.cpp → src/env/tests/env_tests.cpp
diff --git a/lib/env/tests/env_tests.h → src/env/tests/env_tests.h b/lib/env/tests/env_tests.h → src/env/tests/env_tests.h
diff --git a/src/ui/CMakeLists.txt → src/env/xplane/CMakeLists.txt b/src/ui/CMakeLists.txt → src/env/xplane/CMakeLists.txt
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------------------------------------------------
 #   XMidiCtrl - MIDI Controller plugin for X-Plane
 #
-#   Copyright (c) 2021-2023 Marco Auer
+#   Copyright (c) 2021-2024 Marco Auer
 #
 #   XMidiCtrl is free software: you can redistribute it and/or modify it under the terms of the
 #   GNU Affero General Public License as published by the Free Software Foundation, either version 3
@@ -15,17 +15,40 @@
 #   If not, see <https://www.gnu.org/licenses/>.
 #----------------------------------------------------------------------------------------------------------------------
 
-message("---- Directory: src/ui")
+# Set required CMake version
+cmake_minimum_required(VERSION 3.16)
 
-# Set sources
-set(UI_SRC
+# Set project details
+project(xmidictrl-env-xplane)
+
+message("-- Configuring build scripts for library ${PROJECT_NAME}")
+
+# Include fonts
+include_directories(${FONTS_INCLUDEDIR})
+
+# Add sources
+set(ENV_SRC_XPLANE
+        ${CMAKE_CURRENT_LIST_DIR}/cmd_xplane.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/data_xplane.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/env_xplane.cpp
         ${CMAKE_CURRENT_LIST_DIR}/ImGuiFontAtlas.cpp
         ${CMAKE_CURRENT_LIST_DIR}/imgui_window.cpp
         ${CMAKE_CURRENT_LIST_DIR}/xplane_window.cpp
-        )
+)
+
+# Apple deprecated OpenGL...yea, we know, keep quiet
+if (APPLE)
+    set_source_files_properties(
+            ${CMAKE_CURRENT_LIST_DIR}/ImgFontAtlas.cpp
+            ${CMAKE_CURRENT_LIST_DIR}/imgui_window.cpp
+            PROPERTIES
+            COMPILE_OPTIONS "-Wno-deprecated-declarations")
+endif()
+
+# Build static library for X-Plane environment
+add_library(${PROJECT_NAME} STATIC)
 
-# Add sources to target
-target_sources(${PROJECT_NAME} PRIVATE ${UI_SRC})
+target_sources(${PROJECT_NAME} PUBLIC ${ENV_SRC_XPLANE})
+target_link_libraries(${PROJECT_NAME} PUBLIC toml11 fmt::fmt-header-only imgui xpsdk xmidictrl-common xmidictrl-env)
 
-# Include current directory
-include_directories(${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
diff --git a/src/ui/ImGuiFontAtlas.cpp → src/env/xplane/ImGuiFontAtlas.cpp b/src/ui/ImGuiFontAtlas.cpp → src/env/xplane/ImGuiFontAtlas.cpp
diff --git a/src/ui/ImGuiFontAtlas.h → src/env/xplane/ImGuiFontAtlas.h b/src/ui/ImGuiFontAtlas.h → src/env/xplane/ImGuiFontAtlas.h
diff --git a/lib/env/xplane/cmd_xplane.cpp → src/env/xplane/cmd_xplane.cpp b/lib/env/xplane/cmd_xplane.cpp → src/env/xplane/cmd_xplane.cpp
diff --git a/lib/env/xplane/cmd_xplane.h → src/env/xplane/cmd_xplane.h b/lib/env/xplane/cmd_xplane.h → src/env/xplane/cmd_xplane.h
diff --git a/lib/env/xplane/data_xplane.cpp → src/env/xplane/data_xplane.cpp b/lib/env/xplane/data_xplane.cpp → src/env/xplane/data_xplane.cpp
diff --git a/lib/env/xplane/data_xplane.h → src/env/xplane/data_xplane.h b/lib/env/xplane/data_xplane.h → src/env/xplane/data_xplane.h
diff --git a/lib/env/xplane/env_xplane.cpp → src/env/xplane/env_xplane.cpp b/lib/env/xplane/env_xplane.cpp → src/env/xplane/env_xplane.cpp
diff --git a/lib/env/xplane/env_xplane.h → src/env/xplane/env_xplane.h b/lib/env/xplane/env_xplane.h → src/env/xplane/env_xplane.h
diff --git a/src/ui/imgui_window.cpp → src/env/xplane/imgui_window.cpp b/src/ui/imgui_window.cpp → src/env/xplane/imgui_window.cpp
diff --git a/src/ui/imgui_window.h → src/env/xplane/imgui_window.h b/src/ui/imgui_window.h → src/env/xplane/imgui_window.h
diff --git a/src/ui/xplane_window.cpp → src/env/xplane/xplane_window.cpp b/src/ui/xplane_window.cpp → src/env/xplane/xplane_window.cpp
diff --git a/src/ui/xplane_window.h → src/env/xplane/xplane_window.h b/src/ui/xplane_window.h → src/env/xplane/xplane_window.h