Merge pull request #195 from Unity-Technologies/UNI-22634-bindings-ship-as-binaries

UNI-22634-bindings-ship-as-binaries (part2)

Author: inwoods

CMakeLists.txt

@@ -225,28 +225,63 @@ set(CLASS_LIBRARY_NAME "FbxSharp.dll")
 string( TOLOWER "${CMAKE_BUILD_TYPE}" LOWER_CMAKE_BUILD_TYPE )
 if(LOWER_CMAKE_BUILD_TYPE MATCHES release)
     string(CONCAT CS_COMPILE_CMD $<$<PLATFORM_ID:"Darwin">:"${MONO_COMPILER} "> "${CSHARP_COMPILER}")
+
+    if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+        add_custom_target(
+            class_library ALL
+            COMMAND "${CS_COMPILE_CMD}"
+                    /noconfig
+                    /nowarn:1701,1702,2008
+                    /langversion:4
+                    /nostdlib+
+                    /warn:4
+                    /optimize+
+                    /out:${CLASS_LIBRARY_NAME}
+                    /target:library
+                    /reference:\"${CSHARP_MSCORLIB_LIBRARY}\"
+                    /reference:\"${CSHARP_SYSTEM_CORE_LIBRARY}\"
+                    /reference:\"${CSHARP_SYSTEM_LIBRARY}\"
+                    /reference:\"${CSHARP_UNITYEDITOR_LIBRARY}\"
+                    ${CMAKE_SOURCE_DIR}/scripts/Properties\\AssemblyInfo.cs
+                    ${CMAKE_SOURCE_DIR}/src/optimized\\*.cs
+                    ${CMAKE_BINARY_DIR}/swig/generated/csharp\\*.cs
+            DEPENDS fbxsdk_csharp globals_replace
+            COMMENT "Building FbxSharp assembly"
+            WORKING_DIRECTORY ${CLASS_LIBRARY_DEST}
+        )
+    else()
+        FILE(GLOB CSHARP_SOURCES_properties "${CMAKE_SOURCE_DIR}/scripts/Properties/*.cs")
+        SET(CSHARP_SOURCES ${CSHARP_SOURCES} ${CSHARP_SOURCES_properties})
+
+        FILE(GLOB CSHARP_SOURCES_optimized "${CMAKE_SOURCE_DIR}/src/optimized/*.cs")
+        SET(CSHARP_SOURCES ${CSHARP_SOURCES} ${CSHARP_SOURCES_optimized})
+
+        set(CSHARP_GENERATED_SOURCES "\"${CMAKE_BINARY_DIR}/swig/generated/csharp/*.cs\"")
+        
+        SET(CSHARP_UNITYEDITOR_LIBRARY "/Applications/Unity 2017.1.0f3/Unity.app/Contents/Managed/UnityEditor.dll")
+
+        set(CSHARP_REFERENCES /reference:"\"${CSHARP_MSCORLIB_LIBRARY}\"";/reference:"\"${CSHARP_SYSTEM_CORE_LIBRARY}\"";/reference:"\"${CSHARP_SYSTEM_LIBRARY}\"";/reference:"\"${CSHARP_UNITYEDITOR_LIBRARY}\"")
+        
+        add_custom_target(
+            class_library ALL
+            COMMAND "${CS_COMPILE_CMD}"
+                    /noconfig
+                    /nowarn:1701,1702,2008
+                    /langversion:4
+                    /nostdlib+
+                    /warn:4
+                    /optimize+
+                    /out:${CLASS_LIBRARY_NAME}
+                    /target:library
+                    ${CSHARP_REFERENCES}
+                    ${CSHARP_SOURCES}
+                    ${CSHARP_GENERATED_SOURCES}
+            DEPENDS fbxsdk_csharp globals_replace
+            COMMENT "Building FbxSharp assembly"
+            WORKING_DIRECTORY ${CLASS_LIBRARY_DEST}
+        )
+    endif()
 
-    add_custom_target(
-        class_library ALL
-        COMMAND "${CS_COMPILE_CMD}"
-                /noconfig
-                /nowarn:1701,1702,2008
-                /langversion:4
-                /nostdlib+
-                /warn:4
-                /optimize+
-                /out:${CLASS_LIBRARY_NAME}
-                /target:library
-                /reference:"\"${CSHARP_MSCORLIB_LIBRARY}\""
-                /reference:"\"${CSHARP_SYSTEM_CORE_LIBRARY}\""
-                /reference:"\"${CSHARP_SYSTEM_LIBRARY}\""
-                ${CMAKE_SOURCE_DIR}/scripts/Properties/AssemblyInfo.cs
-                ${CMAKE_SOURCE_DIR}/src/optimized/*.cs
-                ${CMAKE_BINARY_DIR}/swig/generated/csharp/*.cs
-        DEPENDS fbxsdk_csharp globals_replace
-        COMMENT "Building FbxSharp assembly"
-        WORKING_DIRECTORY ${CLASS_LIBRARY_DEST}
-    )
     add_custom_target(
         class_library_dir
         COMMAND         ${CMAKE_COMMAND} -E make_directory ${CLASS_LIBRARY_DEST}

deps/cmake/FindUnity.cmake

@@ -14,14 +14,20 @@ if (NOT DEFINED UNITY_EDITOR_PATH)
       set(UNITY_PATH "/Applications/Unity")
       set(MONODEVELOP_PATH "${UNITY_PATH}/MonoDevelop.app")
       list(APPEND UNITY_EXECUTABLE_PATHS "${UNITY_PATH}/Unity.app/Contents/MacOS/")
+      
     elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-      set(UNITY_PATH "c:/Program Files/Unity")
+      SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+      
+      set(UNITY_PATH "c:/Program Files/Unity2017.1.0f3")
       set(MONODEVELOP_PATH "${UNITY_PATH}/MonoDevelop")
       list(APPEND UNITY_EXECUTABLE_PATHS "${UNITY_PATH}/Editor/")
+      
     elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    
       set(UNITY_PATH "/opt/Unity")
       set(MONODEVELOP_PATH "${UNITY_PATH}/MonoDevelop")
       list(APPEND UNITY_EXECUTABLE_PATHS "${UNITY_PATH}/Editor/")
+      
     endif()
 
     find_program(UNITY_EDITOR_PATH Unity PATHS ${UNITY_EXECUTABLE_PATHS})
@@ -32,4 +38,30 @@ else()
     message("Using ${UNITY_EDITOR_PATH}")
 endif()
 
+if (NOT DEFINED UNITY_EDITOR_DLL_PATH)
+    SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+    
+    if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+        get_filename_component(UNITY_EDITOR_DLL_PATH "${UNITY_EDITOR_PATH}" PATH)
+        get_filename_component(UNITY_EDITOR_DLL_PATH "${UNITY_EDITOR_DLL_PATH}" DIRECTORY)
+
+        set(UNITY_EDITOR_DLL_PATH "${UNITY_EDITOR_DLL_PATH}/Managed")
+
+    elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+        get_filename_component(UNITY_EDITOR_DLL_PATH "${UNITY_EDITOR_PATH}" PATH)
+        set(UNITY_EDITOR_DLL_PATH "${UNITY_EDITOR_DLL_PATH}/Data/Managed")
+
+    elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+        get_filename_component(UNITY_EDITOR_DLL_PATH "${UNITY_EDITOR_PATH}" PATH)
+        set(UNITY_EDITOR_DLL_PATH "${UNITY_EDITOR_DLL_PATH}/Data/Managed")
+    endif()
 
+    message("Looking for UnityEditor.dll in ${UNITY_EDITOR_DLL_PATH}")
+    find_library(CSHARP_UNITYEDITOR_LIBRARY UnityEditor.dll PATH ${UNITY_EDITOR_DLL_PATH})
+    message("Found: ${CSHARP_UNITYEDITOR_LIBRARY}")
+    
+    # Standard code to report whether we found the package or not.
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(UnityEditor DEFAULT_MSG CSHARP_UNITYEDITOR_LIBRARY)
+else()
+    message("Using ${UNITY_EDITOR_DLL_PATH}")
+endif()