Adjust for new Platform Requirements

2022-09-08 02:20:55 +02:00
parent 8b9f5d0406
commit 7d45ca71ba
11 changed files with 131 additions and 194 deletions
@@ -57,11 +57,9 @@ if(APPLE)
        APL
    )
    target_compile_options(germanairlinesva_xplugin PRIVATE
-        "SHELL:-arch i386"
        "SHELL:-arch x86_64"
    )
    target_link_options(germanairlinesva_xplugin PRIVATE
-        "SHELL:-arch i386"
        "SHELL:-arch x86_64"
    )
    target_link_libraries(germanairlinesva_xplugin PRIVATE
@@ -82,14 +80,6 @@ elseif(UNIX)
    target_compile_options(germanairlinesva_xplugin PRIVATE
        -nodefaultlibs
    )
-    if(BIT STREQUAL "32")
-        target_compile_options(germanairlinesva_xplugin PRIVATE
-            -m32
-        )
-        target_link_options(germanairlinesva_xplugin PRIVATE
-            -m32
-        )
-    endif()
    target_link_libraries(germanairlinesva_xplugin PRIVATE
        pthread
    )
@@ -118,15 +108,9 @@ elseif(WIN32)
    )
    target_link_libraries(germanairlinesva_xplugin PRIVATE
    )
-    if(BIT STREQUAL "32")
-        target_link_libraries(germanairlinesva_xplugin PRIVATE
-            ${CMAKE_SOURCE_DIR}/XPSDK/Libraries/Win/XPLM.lib
-        )
-    else()
-        target_link_libraries(germanairlinesva_xplugin PRIVATE
-            ${CMAKE_SOURCE_DIR}/XPSDK/Libraries/Win/XPLM_64.lib
-        )
-    endif()
+    target_link_libraries(germanairlinesva_xplugin PRIVATE
+        ${CMAKE_SOURCE_DIR}/XPSDK/Libraries/Win/XPLM_64.lib
+    )
    target_sources(germanairlinesva_xplugin PRIVATE
        xPluginWin.cpp
    )