Jelajahi Sumber

修复macos上的recast编译脚本, 提交macos上的寻路库

tanghai 4 tahun lalu
induk
melakukan
b6527a89b8

+ 11 - 14
Libs/RecastDll/CMakeLists.txt

@@ -26,20 +26,20 @@ MARK_AS_ADVANCED(RecastDll_PROJECT_DIR)
 # 配置cpp文件
 file(GLOB RECASTDLL_SOURCES 
 	Source/*.cpp
-	../Detour/Source/*.cpp 
-	../DetourCrowd/Source/*.cpp 
-	../DetourTileCache/Source/*.cpp 
-	../Recast/Source/*.cpp
+	Detour/Source/*.cpp 
+	DetourCrowd/Source/*.cpp 
+	DetourTileCache/Source/*.cpp 
+	Recast/Source/*.cpp
 )
 
 # 配置头文件
 include_directories(
 	Include
-	../DebugUtils/Include
-	../Detour/Include
-	../DetourCrowd/Include
-	../DetourTileCache/Include
-	../Recast/Include
+	DebugUtils/Include
+	Detour/Include
+	DetourCrowd/Include
+	DetourTileCache/Include
+	Recast/Include
 )
 
 macro(source_group_by_dir proj_dir source_files)
@@ -66,11 +66,8 @@ if (APPLE)
         set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
         add_library(RecastDll STATIC ${RECASTDLL_SOURCES})
     else ()
-        set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_32_64_BIT)")
-        add_library(RecastDll MODULE ${RECASTDLL_SOURCES})
-        set_target_properties ( kcp PROPERTIES BUNDLE TRUE )
-        #set_target_properties ( kcp PROPERTIES FRAMEWORK TRUE )
-        #set_target_properties ( kcp PROPERTIES MACOSX_RPATH TRUE )
+        set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_64_BIT)")
+        add_library(RecastDll SHARED ${RECASTDLL_SOURCES})
     endif ()
 else ( )
     add_library(RecastDll SHARED ${RECASTDLL_SOURCES})

+ 4 - 0
ThirdParty/ShareLib/ShareLib.csproj

@@ -15,6 +15,10 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <Content Include="..\..\Unity\Assets\Plugins\MacOS\libRecastDll.dylib">
+        <Link>libRecastDll.dylib</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
       <Content Include="..\..\Unity\Assets\Plugins\x86_64\RecastDll.dll">
           <Link>RecastDll.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

TEMPAT SAMPAH
Unity/Assets/Plugins/MacOS/libRecastDll.dylib


+ 33 - 0
Unity/Assets/Plugins/MacOS/libRecastDll.dylib.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 8e7dc169c786249d88671b522f0bc9fe
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff ditekan karena terlalu besar
+ 0 - 0
Unity/Unity.Mono.csproj


File diff ditekan karena terlalu besar
+ 0 - 0
Unity/Unity.ThirdParty.csproj


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini