IX own module

xplugin/CMakeLists.txt

@@ -5,12 +5,10 @@
 #)
 #Link to ssl(requires OpenSLL for macOS and Windows)
 
-file(GLOB ixwebsocket CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/ixwebsocket/*.cpp)
 file(GLOB websocket CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/websocket/*.cpp)
 file(GLOB file CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/file/*.cpp)
 
 add_library(germanairlinesva_xplugin SHARED
-    ${ixwebsocket}
     ${websocket}
     ${file}
     makeRwysXP.cpp
@@ -58,6 +56,7 @@ if(APPLE)
 
     set_target_properties(germanairlinesva_xplugin PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}
+        INSTALL_RPATH "@loader_path"
         OUTPUT_NAME mac
     )
 
@@ -65,23 +64,23 @@ 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
-        "-framework Security"
+        ixwebsocket
     )
 elseif(UNIX)
     message("Building for Linux ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}")
 
     set_target_properties(germanairlinesva_xplugin PROPERTIES
-        NO_SONAME 1
         LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}
+        INSTALL_RPATH "\$ORIGIN"
         OUTPUT_NAME lin
     )
 
@@ -102,6 +101,7 @@ 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}")
@@ -129,6 +129,7 @@ elseif(WIN32)
     )
     target_link_libraries(germanairlinesva_xplugin PRIVATE
         ws2_32.lib
+        ixwebsocket
     )
     if(BIT STREQUAL "32")
         target_link_libraries(germanairlinesva_xplugin PRIVATE