Remove ixWebSocket

xplugin/CMakeLists.txt

@@ -1,23 +1,15 @@
-#For TLS
-#target_compile_definitions(WebSocketServerXPlane PUBLIC
-#IXWEBSOCKET_USE_TLS
-#IXWEBSOCKET_USE_OPEN_SSL
-#)
-#Link to ssl(requires OpenSLL for macOS and Windows)
-
-file(GLOB websocket CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/websocket/*.cpp)
+file(GLOB socket CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/socket/*.cpp)
 file(GLOB file CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/file/*.cpp)
 
 add_library(germanairlinesva_xplugin SHARED
-    ${websocket}
+    ${socket}
     ${file}
     makeRwysXP.cpp
     main.cpp
 )
 
 target_include_directories(germanairlinesva_xplugin PRIVATE
-    ${CMAKE_SOURCE_DIR}/ixwebsocket/include
-    ${CMAKE_SOURCE_DIR}/websocket/include
+    ${CMAKE_SOURCE_DIR}/socket/include
     ${CMAKE_SOURCE_DIR}/XPSDK/CHeaders
     ${CMAKE_SOURCE_DIR}/nlohmann
     ${CMAKE_SOURCE_DIR}/file
@@ -64,16 +56,16 @@ if(APPLE)
         APL
     )
     target_compile_options(germanairlinesva_xplugin PRIVATE
-        #"SHELL:-arch i386"
+        "SHELL:-arch i386"
         "SHELL:-arch x86_64"
     )
     target_link_options(germanairlinesva_xplugin PRIVATE
-        #"SHELL:-arch i386"
+        "SHELL:-arch i386"
         "SHELL:-arch x86_64"
     )
     target_link_libraries(germanairlinesva_xplugin PRIVATE
         ${CMAKE_SOURCE_DIR}/XPSDK/Libraries/Mac/XPLM.framework/XPLM
-        ixwebsocket
+        "-framework Security"
     )
 elseif(UNIX)
     message("Building for Linux ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}")
@@ -101,7 +93,6 @@ elseif(UNIX)
     target_link_libraries(germanairlinesva_xplugin PRIVATE
         crypto
         pthread
-        ixwebsocket
     )
 elseif(WIN32)
     message("Building for Windows ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}")
@@ -123,13 +114,11 @@ elseif(WIN32)
         )
     endif()
     target_link_options(germanairlinesva_xplugin PRIVATE
-        -static
         -static-libgcc
         -static-libstdc++
     )
     target_link_libraries(germanairlinesva_xplugin PRIVATE
         ws2_32.lib
-        ixwebsocket
     )
     if(BIT STREQUAL "32")
         target_link_libraries(germanairlinesva_xplugin PRIVATE