Skip to content

Commit 303d9bf

Browse files
committed
Use external ETextureParams.
1 parent 20302a8 commit 303d9bf

File tree

6 files changed

+10
-435
lines changed

6 files changed

+10
-435
lines changed

src/utils/xrDXT/DXT.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "stdafx.h"
22
#include "dxtlib.h"
33
#include <nvtt/nvtt.h>
4-
#include "ETextureParams.h"
4+
#include "Layers/xrRender/ETextureParams.h"
55
//#include "dds.h"
66

77
//BOOL APIENTRY DllMain(HANDLE hModule, u32 ul_reason_for_call, LPVOID lpReserved) { return TRUE; }

src/utils/xrDXT/DXT.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@
131131
</ClCompile>
132132
</ItemDefinitionGroup>
133133
<ItemGroup>
134+
<ClInclude Include="..\..\Layers\xrRender\ETextureParams.h" />
134135
<ClInclude Include="dds\ConvertColor.h" />
135136
<ClInclude Include="dds\ddsTypes.h" />
136137
<ClInclude Include="dds\nvErrorCodes.h" />
137138
<ClInclude Include="dds\tPixel.h" />
138139
<ClInclude Include="dds\tVector.h" />
139140
<ClInclude Include="dxtlib.h" />
140-
<ClInclude Include="ETextureParams.h" />
141141
<ClInclude Include="Image_DXTC.h" />
142142
<ClInclude Include="NV_Common.h" />
143143
<ClInclude Include="NVI_Convolution.h" />
@@ -146,8 +146,8 @@
146146
<ClInclude Include="StdAfx.h" />
147147
</ItemGroup>
148148
<ItemGroup>
149+
<ClCompile Include="..\..\Layers\xrRender\ETextureParams.cpp" />
149150
<ClCompile Include="DXT.cpp" />
150-
<ClCompile Include="ETextureParams.cpp" />
151151
<ClCompile Include="Image_DXTC.cpp" />
152152
<ClCompile Include="NormalMapGen.cpp" />
153153
<ClCompile Include="NVI_Convolution.cpp" />

src/utils/xrDXT/DXT.vcxproj.filters

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
</Filter>
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ClInclude Include="ETextureParams.h">
16-
<Filter>Shared</Filter>
17-
</ClInclude>
1815
<ClInclude Include="Image_DXTC.h">
1916
<Filter>NormalMap</Filter>
2017
</ClInclude>
@@ -37,14 +34,14 @@
3734
<ClInclude Include="dxtlib.h">
3835
<Filter>Convert</Filter>
3936
</ClInclude>
37+
<ClInclude Include="..\..\Layers\xrRender\ETextureParams.h">
38+
<Filter>Shared</Filter>
39+
</ClInclude>
4040
</ItemGroup>
4141
<ItemGroup>
4242
<ClCompile Include="DXT.cpp">
4343
<Filter>Convert</Filter>
4444
</ClCompile>
45-
<ClCompile Include="ETextureParams.cpp">
46-
<Filter>Shared</Filter>
47-
</ClCompile>
4845
<ClCompile Include="Image_DXTC.cpp">
4946
<Filter>NormalMap</Filter>
5047
</ClCompile>
@@ -58,5 +55,8 @@
5855
<Filter>NormalMap</Filter>
5956
</ClCompile>
6057
<ClCompile Include="StdAfx.cpp" />
58+
<ClCompile Include="..\..\Layers\xrRender\ETextureParams.cpp">
59+
<Filter>Shared</Filter>
60+
</ClCompile>
6161
</ItemGroup>
6262
</Project>

src/utils/xrDXT/ETextureParams.cpp

Lines changed: 0 additions & 250 deletions
This file was deleted.

0 commit comments

Comments
 (0)