Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 4fa9880

Browse files
shanashana
authored
Merge pull request #265 from github-for-unity/fixes/mac-build
Fix build on mac
2 parents 3b0f20e + c62fa89 commit 4fa9880

File tree

5 files changed

+44
-31
lines changed

5 files changed

+44
-31
lines changed

Diff for: ‎common/nativelibraries.props

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<Content Include="$(SolutionDir)\lib\sfw\linux\libsfw.so">
4+
<None Include="$(SolutionDir)\lib\sfw\linux\libsfw.so">
55
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6-
</Content>
7-
<Content Include="$(SolutionDir)\lib\sfw\linux\libsfw.so.meta">
6+
</None>
7+
<None Include="$(SolutionDir)\lib\sfw\linux\libsfw.so.meta">
88
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9-
</Content>
10-
<Content Include="$(SolutionDir)\lib\sfw\mac\libsfw.bundle">
9+
</None>
10+
<None Include="$(SolutionDir)\lib\sfw\mac\libsfw.bundle">
1111
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
12-
</Content>
13-
<Content Include="$(SolutionDir)\lib\sfw\mac\libsfw.bundle.meta">
12+
</None>
13+
<None Include="$(SolutionDir)\lib\sfw\mac\libsfw.bundle.meta">
1414
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
15-
</Content>
16-
<Content Include="$(SolutionDir)\lib\sfw\win\x64\sfw_x64.dll">
15+
</None>
16+
<None Include="$(SolutionDir)\lib\sfw\win\x64\sfw_x64.dll">
1717
<Link>x64\sfw_x64.dll</Link>
1818
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19-
</Content>
20-
<Content Include="$(SolutionDir)\lib\sfw\win\x64\sfw_x64.dll.meta">
19+
</None>
20+
<None Include="$(SolutionDir)\lib\sfw\win\x64\sfw_x64.dll.meta">
2121
<Link>x64\sfw_x64.dll.meta</Link>
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
23-
</Content>
24-
<Content Include="$(SolutionDir)\lib\sfw\win\x64\pthreadVC2.dll">
23+
</None>
24+
<None Include="$(SolutionDir)\lib\sfw\win\x64\pthreadVC2.dll">
2525
<Link>x64\pthreadVC2.dll</Link>
2626
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27-
</Content>
28-
<Content Include="$(SolutionDir)\lib\sfw\win\x64\pthreadVC2.dll.meta">
27+
</None>
28+
<None Include="$(SolutionDir)\lib\sfw\win\x64\pthreadVC2.dll.meta">
2929
<Link>x64\pthreadVC2.dll.meta</Link>
3030
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31-
</Content>
32-
<Content Include="$(SolutionDir)\lib\sfw\win\x86\sfw_x86.dll">
31+
</None>
32+
<None Include="$(SolutionDir)\lib\sfw\win\x86\sfw_x86.dll">
3333
<Link>x86\sfw_x86.dll</Link>
3434
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
35-
</Content>
36-
<Content Include="$(SolutionDir)\lib\sfw\win\x86\sfw_x86.dll.meta">
35+
</None>
36+
<None Include="$(SolutionDir)\lib\sfw\win\x86\sfw_x86.dll.meta">
3737
<Link>x86\sfw_x86.dll.meta</Link>
3838
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
39-
</Content>
40-
<Content Include="$(SolutionDir)\lib\sfw\win\x86\pthreadVC2.dll">
39+
</None>
40+
<None Include="$(SolutionDir)\lib\sfw\win\x86\pthreadVC2.dll">
4141
<Link>x86\pthreadVC2.dll</Link>
4242
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
43-
</Content>
44-
<Content Include="$(SolutionDir)\lib\sfw\win\x86\pthreadVC2.dll.meta">
43+
</None>
44+
<None Include="$(SolutionDir)\lib\sfw\win\x86\pthreadVC2.dll.meta">
4545
<Link>x86\pthreadVC2.dll.meta</Link>
4646
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
47-
</Content>
47+
</None>
4848
</ItemGroup>
4949
</Project>

Diff for: ‎lib/sfw/sfw.net.dll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:5e4c42edfca7f2ca951dca6a219c1e40a220cc2a776fd8038b6fa7772caae65f
2+
oid sha256:21feeaa73e42bf03e86525bc5e1b954f4b9a2f16eed58a87c69e576509231480
33
size 7168

Diff for: ‎lib/sfw/sfw.net.dll.mdb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b791b502720cad7d39c3d6e08c1678a6039b5556782b8fcc1ab90de13a13c8f6
3-
size 1849
2+
oid sha256:9b338de30fd729ffaa83c9ddf3c90a03ad9bdaa3367580316fef3649594a5217
3+
size 1924

Diff for: ‎src/tests/IntegrationTests/IntegrationTests.csproj

+10-3
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@
115115
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
116116
</ItemGroup>
117117
<Import Project="..\..\..\common\nativelibraries.props" />
118+
<ItemGroup>
119+
<None Include="$(SolutionDir)\lib\sfw\win\x64\sfw_x64.dll">
120+
<Link>sfw_x64.dll</Link>
121+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
122+
</None>
123+
<None Include="$(SolutionDir)\lib\sfw\win\x64\sfw_x64.dll.meta">
124+
<Link>sfw_x64.dll.meta</Link>
125+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
126+
</None>
127+
</ItemGroup>
118128
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
119129
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
120130
Other similar extension points exist, see Microsoft.Common.targets.
@@ -124,7 +134,4 @@
124134
</Target>
125135
-->
126136
<Import Project="..\..\..\common\build.targets" />
127-
<PropertyGroup>
128-
<PostBuildEvent>copy $(OutDir)x64\* $(OutDir)</PostBuildEvent>
129-
</PropertyGroup>
130137
</Project>

Diff for: ‎unity/PackageProject/.gitignore

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,10 @@
1010
*.bundle
1111
ProjectVersion.txt
1212

13-
Library/
13+
Library/
14+
15+
// These files come from lib/
16+
Assets/GitHub/Editor/libsfw.bundle.meta
17+
Assets/GitHub/Editor/libsfw.so.meta
18+
Assets/GitHub/Editor/x64/
19+
Assets/GitHub/Editor/x86/

0 commit comments

Comments
 (0)