1 files changed, 18 insertions, 6 deletions

@@ -1,15 +1,15 @@
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required (VERSION 3.20)
 project (lingo_ap_tracker)
 
 if (MSVC)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
 set(CMAKE_WIN32_EXECUTABLE true)
+set(CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO)
 endif(MSVC)
 
 find_package(wxWidgets CONFIG REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(yaml-cpp REQUIRED)
-find_package(websocketpp REQUIRED)
 find_package(fmt REQUIRED)
 
 include_directories(
@@ -18,7 +18,7 @@ include_directories(
   vendor/asio/asio/include
   vendor/nlohmann
   vendor/valijson/include
-  ${websocketpp_INCLUDE_DIRS}
+  vendor/websocketpp
   vendor/wswrap/include
   ${yaml-cpp_INCLUDE_DIRS}
   ${OpenSSL_INCLUDE_DIRS}
@@ -32,7 +32,7 @@ include_directories(${SYSTEM_INCLUDE_DIR})
 
 link_directories(${openssl_LIBRARY_DIRS})
 
-add_executable(lingo_ap_tracker
+set(SOURCE_FILES
   "src/main.cpp"
   "src/tracker_frame.cpp"
   "src/tracker_panel.cpp"
@@ -48,14 +48,26 @@ add_executable(lingo_ap_tracker
   "src/subway_map.cpp"
   "src/network_set.cpp"
   "src/logger.cpp"
-  "src/godot_variant.cpp"
   "src/ipc_state.cpp"
   "src/ipc_dialog.cpp"
+  "src/report_popup.cpp"
+  "src/updater.cpp"
+  "src/icons.cpp"
+  "src/paintings_pane.cpp"
+  "src/items_pane.cpp"
+  "src/options_pane.cpp"
+  "src/log_dialog.cpp"
   "vendor/whereami/whereami.c"
 )
+
+if (MSVC)
+list(APPEND SOURCE_FILES "src/windows.rc")
+endif(MSVC)
+
+add_executable(lingo_ap_tracker ${SOURCE_FILES})
 set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD 20)
 set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(lingo_ap_tracker PRIVATE fmt::fmt OpenSSL::SSL OpenSSL::Crypto websocketpp::websocketpp wx::core wx::base wx::net yaml-cpp::yaml-cpp)
+target_link_libraries(lingo_ap_tracker PRIVATE fmt::fmt OpenSSL::SSL OpenSSL::Crypto wx::core wx::base wx::net yaml-cpp::yaml-cpp)
 
 set(SRC_DIR "${CMAKE_SOURCE_DIR}/assets")
 set(DST_DIR "${CMAKE_BINARY_DIR}/$<CONFIG>/assets")