Adjust for new Platform Requirements

simdata/CMakeLists.txt

@@ -39,11 +39,9 @@ if(APPLE)
     )
 
     target_compile_options(simdata PRIVATE
-        "SHELL:-arch i386"
         "SHELL:-arch x86_64"
     )
     target_link_options(simdata PRIVATE
-        "SHELL:-arch i386"
         "SHELL:-arch x86_64"
     )
     target_link_libraries(simdata PRIVATE
@@ -59,7 +57,7 @@ elseif(UNIX)
     target_compile_options(simdata PRIVATE
         -nodefaultlibs
     )
-    if(BIT STREQUAL "32")
+    if()
         target_compile_options(simdata PRIVATE
             -m32
         )
@@ -68,11 +66,19 @@ elseif(UNIX)
         )
     endif()
 elseif(WIN32)
-    message("Building simdata for Windows ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}")
+    if (BIT STREQUAL "32")
+        message("Building simdata for Windows ${BIT} into ${PROJECT_BINARY_DIR}/FSConnect")
 
-    set_target_properties(simdata PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}"
-    )
+        set_target_properties(simdata PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/FSConnect"
+        )
+    else()
+        message("Building simdata for Windows ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}")
+
+        set_target_properties(simdata PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}"
+        )
+    endif()
 
     if(DEBUG)
         target_compile_options(simdata PRIVATE