Permalink
Browse files

Merge pull request #1353 from dellis1972/develop3d

Changes to get MGCB and NVTT working on Mac
  • Loading branch information...
2 parents f10c7ee + aa99b28 commit 62a15229cc705e912cc75a559a24994a5ee4eccc @tomspilman tomspilman committed Feb 11, 2013
Showing with 14 additions and 2 deletions.
  1. +1 −1 ThirdParty/Libs
  2. +9 −1 Tools/MGCB/MGCB.MacOS.csproj
  3. +4 −0 Tools/MGCB/Nvidia.TextureTools.dll.config
Submodule Libs updated from 8d0c75 to c3d492
@@ -36,7 +36,6 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
- <PlatformTarget>anycpu</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>False</DebugSymbols>
@@ -78,4 +77,13 @@
<Target Name="AfterBuild">
</Target>
-->
+ <ItemGroup>
+ <Content Include="Nvidia.TextureTools.dll.config">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="..\..\ThirdParty\Libs\NVTT\MacOS\libnvtt.dylib">
+ <Link>libnvtt.dylib</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
</Project>
@@ -0,0 +1,4 @@
+<configuration>
+<dllmap os="macos" dll="nvtt.dll" target="libnvtt.dylib"/>
+<dllmap os="linux" dll="nvtt.dll" target="libnvtt.so"/>
+</configuration>

0 comments on commit 62a1522

Please sign in to comment.