Developer Experience Release. Added LMS and code refactor.

CMakeLists.txt

@@ -27,7 +27,7 @@ if (UNIX)
 
   #Secure library usage and secure compile flags
   add_definitions (-fstack-protector-strong -D_FORTIFY_SOURCE=2 -O2 -Wformat -Wformat-security)
-  add_definitions (-fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv)
+  add_definitions (-fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv -fpermissive)
 else (UNIX)
   add_definitions (/GS /sdl)
   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NXCompat /DynamicBase")
@@ -39,21 +39,10 @@ else (UNIX)
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
 endif (UNIX)
 
-
-# Download and unpack lms at configure time
-configure_file(lms.cmake.in
-               lms-download/CMakeLists.txt)
-execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lms-download )
-execute_process(COMMAND ${CMAKE_COMMAND} --build .
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lms-download )
-
-# Add  MEIClient directly to our build. This adds
-# the following targets: LmsMEIClient and LIBMETEE
-add_subdirectory(${CMAKE_BINARY_DIR}/lms-src/MEIClient
-                 ${CMAKE_BINARY_DIR}/lms-build/MEIClient)
-add_dependencies(LmsMEIClient libmetee)
-
+# Add  MicroLMS directly to our build. This adds
+# the following targets: MicroLMS
+add_subdirectory(MicroLMS)
+#add_dependencies(rpc MicroLMS)
 
 if (UNIX)
 
@@ -63,6 +52,7 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 find_package(Threads REQUIRED)
 
 # Find Boost
+set(Boost_USE_STATIC_LIBS ON)
 find_package(Boost COMPONENTS system REQUIRED)
 
 # Find OpenSSL
@@ -94,17 +84,28 @@ endif (UNIX)
 
 # ccu-poc
 add_executable (rpc
-  AMTHIClient/Include/GetControlModeCommand.h
-  AMTHIClient/Src/GetControlModeCommand.cpp
+  info.h
+  info.cpp
+  args.h
+  args.cpp
+  usage.h
+  usage.cpp
+  port.h
+  utils.h
+  utils.cpp
+  network.h
+  network.cpp
   commands.h
   commands.cpp
+  activation.h
+  activation.cpp
   lms.h
   lms.cpp
   main.cpp
 )
 
 target_include_directories(rpc PUBLIC
-  "AMTHIClient/Include/"
+  "MicroLMS/heci"
 )
 
 if (UNIX)
@@ -112,20 +113,33 @@ if (UNIX)
 add_dependencies(rpc cpprestsdk)
 
 target_link_libraries (rpc PRIVATE 
-  LmsMEIClient
+  MicroLMS
   cpprest
 )
 
 else (UNIX)
 
+add_dependencies(rpc MicroLMS )
+
 target_link_libraries (rpc PRIVATE 
-  LmsMEIClient
+  MicroLMS
   iphlpapi
   cpprestsdk::cpprest
   cpprestsdk::cpprestsdk_zlib_internal
   cpprestsdk::cpprestsdk_boost_internal
   cpprestsdk::cpprestsdk_brotli_internal
   ${Boost_LIBRARIES}
+  DbgHelp.lib
+    Iphlpapi.lib
+    Setupapi.lib
+    ws2_32.lib
+    Psapi.lib
+    Crypt32.lib
+    Wintrust.lib
+    Version.lib
+    Wtsapi32.lib
+    Gdiplus.lib
+    Userenv.lib
 )
 
 endif (UNIX)