Fixes for crosscompiling

Build/CMake/Modules/AtomicLinux.cmake

@@ -1,5 +1,4 @@
 set(JAVASCRIPT_BINDINGS_PLATFORM "LINUX")
-set(ATOMIC_NODE_JAKE Build/Linux/node/node Build/node_modules/jake/bin/cli.js -f Build/Scripts/Bootstrap.js)
 
 include(AtomicDesktop)
 

Build/CMake/Modules/AtomicMac.cmake

@@ -1,6 +1,4 @@
-
 set(JAVASCRIPT_BINDINGS_PLATFORM "MACOSX")
-set(ATOMIC_NODE_JAKE Build/Mac/node/node Build/node_modules/jake/bin/cli.js -f Build/Scripts/Bootstrap.js)
 
 include(BundleUtilities)
 include(AtomicDesktop)
@@ -13,11 +11,11 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
 
 if (CMAKE_GENERATOR STREQUAL "Xcode")
     set(ATOMIC_XCODE 1)
-else ()
+elseif (NOT CMAKE_CROSSCOMPILING)
     # When not using XCode, linker takes a long time, which this flag seems to be being passed during xcode builds
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Xlinker -no_deduplicate")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -no_deduplicate")
 endif ()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -stdlib=libc++")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -framework AudioToolbox -framework Carbon -framework Cocoa -framework CoreAudio -framework CoreVideo -framework ForceFeedback -framework IOKit -framework OpenGL -framework CoreServices -framework Security -framework SystemConfiguration")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -framework AudioToolbox -framework Carbon -framework Cocoa -framework CoreAudio -framework CoreVideo -framework ForceFeedback -framework IOKit -framework OpenGL -framework CoreServices -framework Security -framework SystemConfiguration")

Build/CMake/Modules/AtomicPlatform.cmake

@@ -1,6 +1,17 @@
 
 set(ATOMIC_DYNAMIC_RUNTIME OFF CACHE BOOL "Build engine as shared library and link dynamically to system runtime.")
 
+if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
+    set(ATOMIC_NODE_JAKE Build/Mac/node/node Build/node_modules/jake/bin/cli.js -f Build/Scripts/Bootstrap.js)
+endif()
+if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
+    set(ATOMIC_NODE_JAKE Build/Linux/node/node Build/node_modules/jake/bin/cli.js -f Build/Scripts/Bootstrap.js)
+endif()
+if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
+    set(ATOMIC_NODE_JAKE Build/Windows/node/node.exe Build/node_modules/jake/bin/cli.js -f Build\\Scripts\\Bootstrap.js)
+endif()
+
+
 if (WIN32)
     include(AtomicWindows)
 elseif (APPLE)

Build/CMake/Modules/AtomicWindows.cmake

@@ -5,8 +5,6 @@ include(AtomicDesktop)
 
 #set (CMAKE_DEBUG_POSTFIX _d)
 
-set(ATOMIC_NODE_JAKE Build/Windows/node/node.exe Build/node_modules/jake/bin/cli.js -f Build\\Scripts\\Bootstrap.js)
-
 set(D3DCOMPILER_47_DLL ${ATOMIC_SOURCE_DIR}/Build/Windows/Binaries/${ATOMIC_PROJECT_ARCH_SHORT}/D3DCompiler_47.dll)
 
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)

Source/AtomicEditor/CMakeLists.txt

@@ -28,7 +28,7 @@ if (ATOMIC_WEBVIEW)
     # Target executable names.
     set(CEF_TARGET "AtomicEditor")
     if (OS_MACOSX)
-        set(CEF_HELPER_TARGET "AtomicEditor Helper")
+        set(CEF_HELPER_TARGET "AtomicEditor-Helper")
     endif ()
 
     # Logical target used to link the libcef library.
@@ -106,8 +106,8 @@ if (ATOMIC_WEBVIEW)
             "${CEF_APP}/Contents/Frameworks/${CEF_HELPER_TARGET}.app"
             # Copy the CEF framework into the Frameworks directory.
             COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${CEF_BINARY_DIR}/Chromium Embedded Framework.framework"
-            "${CEF_APP}/Contents/Frameworks/Chromium Embedded Framework.framework"
+            "${CEF_BINARY_DIR}/CEF.framework"
+            "${CEF_APP}/Contents/Frameworks/CEF.framework"
             VERBATIM
         )
 

Source/ThirdParty/CMakeLists.txt

@@ -68,7 +68,9 @@ if (NOT IOS AND NOT ANDROID AND NOT WEB)
         add_subdirectory(LibCpuId)
     endif()
     add_subdirectory(Poco)
-    add_subdirectory(nativefiledialog)
+    if (ATOMIC_EDITOR)
+        add_subdirectory(nativefiledialog)
+    endif ()
     add_subdirectory(libsquish)
 endif ()