DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Change dylib location and use new shared project

Browse Source
This commit is contained in:
Chris Hamons
2017-01-06 13:30:30 -06:00
parent 75c59ef8af
commit 6d6194a96f
3 changed files with 5 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
csharp/Mac/CustomBuildAction.targets
View File

@@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<!-- The # and , in this path does not play nice with the binding project logic, so make a copy --> <!-- The # and , in this path does not play nice with the binding project logic, so make a copy -->
<Target Name="CopyInNativeLib" Inputs="..\..\..\buck-out\gen\csharp\yoganet#default,shared\libyoga.dylib" Outputs="$(ProjectDir)libyoga.dylib"> <Target Name="CopyInNativeLib" Inputs="..\..\buck-out\gen\csharp\yoganet#default,shared\libyoga.dylib" Outputs="$(ProjectDir)libyoga.dylib">
<Copy SourceFiles="..\..\..\buck-out\gen\csharp\yoganet#default,shared\libyoga.dylib" DestinationFiles="$(ProjectDir)/libyoga.dylib" /> <Copy SourceFiles="..\..\buck-out\gen\csharp\yoganet#default,shared\libyoga.dylib" DestinationFiles="$(ProjectDir)/libyoga.dylib" />
</Target> </Target>
</Project> </Project>

72
csharp/Mac/Facebook.Yoga.Mac.csproj
View File

@@ -33,77 +33,6 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" /> <Reference Include="Xamarin.Mac" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Compile Include="..\YogaWrap.cs">
<Link>YogaWrap.cs</Link>
</Compile>
<Compile Include="..\YogaSize.cs">
<Link>YogaSize.cs</Link>
</Compile>
<Compile Include="..\YogaPrintOptions.cs">
<Link>YogaPrintOptions.cs</Link>
</Compile>
<Compile Include="..\YogaPositionType.cs">
<Link>YogaPositionType.cs</Link>
</Compile>
<Compile Include="..\YogaOverflow.cs">
<Link>YogaOverflow.cs</Link>
</Compile>
<Compile Include="..\YogaNode.cs">
<Link>YogaNode.cs</Link>
</Compile>
<Compile Include="..\YogaNode.Create.cs">
<Link>YogaNode.Create.cs</Link>
</Compile>
<Compile Include="..\YogaMeasureMode.cs">
<Link>YogaMeasureMode.cs</Link>
</Compile>
<Compile Include="..\YogaMeasureFunc.cs">
<Link>YogaMeasureFunc.cs</Link>
</Compile>
<Compile Include="..\YogaLogLevel.cs">
<Link>YogaLogLevel.cs</Link>
</Compile>
<Compile Include="..\YogaLogger.cs">
<Link>YogaLogger.cs</Link>
</Compile>
<Compile Include="..\YogaJustify.cs">
<Link>YogaJustify.cs</Link>
</Compile>
<Compile Include="..\YogaFlexDirection.cs">
<Link>YogaFlexDirection.cs</Link>
</Compile>
<Compile Include="..\YogaExperimentalFeature.cs">
<Link>YogaExperimentalFeature.cs</Link>
</Compile>
<Compile Include="..\YogaEdge.cs">
<Link>YogaEdge.cs</Link>
</Compile>
<Compile Include="..\YogaDirection.cs">
<Link>YogaDirection.cs</Link>
</Compile>
<Compile Include="..\YogaDimension.cs">
<Link>YogaDimension.cs</Link>
</Compile>
<Compile Include="..\YogaConstants.cs">
<Link>YogaConstants.cs</Link>
</Compile>
<Compile Include="..\YogaAlign.cs">
<Link>YogaAlign.cs</Link>
</Compile>
<Compile Include="..\Spacing.cs">
<Link>Spacing.cs</Link>
</Compile>
<Compile Include="..\Native.cs">
<Link>Native.cs</Link>
</Compile>
<Compile Include="..\MeasureOutput.cs">
<Link>MeasureOutput.cs</Link>
</Compile>
<Compile Include="..\MeasureFunction.cs">
<Link>MeasureFunction.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ObjcBindingApiDefinition Include="ApiDefinition.cs" /> <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
</ItemGroup> </ItemGroup>
@@ -116,6 +45,7 @@
<SmartLink>False</SmartLink> <SmartLink>False</SmartLink>
</NativeReference> </NativeReference>
</ItemGroup> </ItemGroup>
<Import Project="..\Facebook.Yoga\Facebook.Yoga.Shared.projitems" Label="Shared" Condition="Exists('..\Facebook.Yoga\Facebook.Yoga.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.ObjcBinding.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.ObjcBinding.CSharp.targets" />
<Import Project="CustomBuildAction.targets" /> <Import Project="CustomBuildAction.targets" />
</Project> </Project>

2
csharp/Mac/Facebook.Yoga.Mac.sln
View File

@@ -5,6 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac.Test", "F
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac", "Facebook.Yoga.Mac.csproj", "{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac", "Facebook.Yoga.Mac.csproj", "{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}"
EndProject EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU