Skip to content

Commit 9c39618

Browse files
walbournwalbourn
committed
Moved D3DX12.h to Common
1 parent fb1739f commit 9c39618

23 files changed

+97
-93
lines changed

‎CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ elseif((BUILD_XBOX_EXTS_XBOXONE OR BUILD_XBOX_EXTS_SCARLETT) AND WIN32)
143143
Auxiliary/DirectXTexXboxTile.cpp)
144144
endif()
145145

146-
147146
if(BUILD_DX11 AND WIN32 AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
148147
set(SHADER_SOURCES
149148
DirectXTex/Shaders/BC6HEncode.hlsl
@@ -160,7 +159,7 @@ if(BUILD_DX12)
160159
list(APPEND LIBRARY_SOURCES DirectXTex/DirectXTexD3D12.cpp)
161160

162161
if(NOT (DEFINED XBOX_CONSOLE_TARGET))
163-
list(APPEND LIBRARY_SOURCES DirectXTex/d3dx12.h)
162+
list(APPEND LIBRARY_SOURCES Common/d3dx12.h)
164163
endif()
165164
endif()
166165

@@ -407,7 +406,6 @@ if(BUILD_TOOLS AND WIN32)
407406
Common/CmdLineHelpers.h
408407
Common/settings.manifest
409408
Texassemble/AnimatedGif.cpp)
410-
target_include_directories(texassemble PRIVATE Common)
411409
target_compile_features(texassemble PRIVATE cxx_std_17)
412410
target_link_libraries(texassemble PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
413411
source_group(texassemble REGULAR_EXPRESSION Texassemble/*.*)
@@ -422,7 +420,6 @@ if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
422420
Common/settings.manifest
423421
Texconv/ExtendedBMP.cpp
424422
Texconv/PortablePixMap.cpp)
425-
target_include_directories(texconv PRIVATE Common)
426423
target_compile_features(texconv PRIVATE cxx_std_17)
427424
target_link_libraries(texconv PRIVATE ${PROJECT_NAME} ole32.lib shell32.lib version.lib)
428425
source_group(texconv REGULAR_EXPRESSION Texconv/*.*)
@@ -435,13 +432,16 @@ if(BUILD_TOOLS AND WIN32)
435432
Texdiag/texdiag.rc
436433
Common/CmdLineHelpers.h
437434
Common/settings.manifest)
438-
target_include_directories(texdiag PRIVATE Common)
439435
target_compile_features(texdiag PRIVATE cxx_std_17)
440436
target_link_libraries(texdiag PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
441437
source_group(texdiag REGULAR_EXPRESSION Texdiag/*.*)
442438
list(APPEND TOOL_EXES texdiag)
443439
endif()
444440

441+
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
442+
target_include_directories(${t} PRIVATE Common)
443+
endforeach()
444+
445445
if(BUILD_TOOLS AND WIN32)
446446
if(ENABLE_OPENEXR_SUPPORT)
447447
foreach(t IN LISTS TOOL_EXES)

‎DirectXTex/d3dx12.h ‎Common/d3dx12.h

File renamed without changes.

‎DDSView/DDSView.rc

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
2828

2929
// Icon with lowest ID value placed first to ensure application icon
3030
// remains consistent on all systems.
31-
IDI_MAIN_ICON ICON "..\Common\directx.ico"
31+
IDI_MAIN_ICON ICON "..\\Common\\directx.ico"
3232

3333
#ifdef APSTUDIO_INVOKED
3434
/////////////////////////////////////////////////////////////////////////////

‎DirectXTex/DirectXTex_Desktop_2019.vcxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
142142
<PrecompiledHeader>Use</PrecompiledHeader>
143143
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
144-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
144+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
145145
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
146146
<SDLCheck>true</SDLCheck>
147147
<ConformanceMode>true</ConformanceMode>
@@ -168,7 +168,7 @@
168168
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169169
<PrecompiledHeader>Use</PrecompiledHeader>
170170
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
171-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
172172
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
173173
<SDLCheck>true</SDLCheck>
174174
<ConformanceMode>true</ConformanceMode>
@@ -195,7 +195,7 @@
195195
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
196196
<PrecompiledHeader>Use</PrecompiledHeader>
197197
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
198-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
198+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
199199
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
200200
<SDLCheck>true</SDLCheck>
201201
<ConformanceMode>true</ConformanceMode>
@@ -221,7 +221,7 @@
221221
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
222222
<PrecompiledHeader>Use</PrecompiledHeader>
223223
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
224-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
224+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
225225
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
226226
<SDLCheck>true</SDLCheck>
227227
<ConformanceMode>true</ConformanceMode>
@@ -249,7 +249,7 @@
249249
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
250250
<PrecompiledHeader>Use</PrecompiledHeader>
251251
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
252-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
252+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
253253
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
254254
<SDLCheck>true</SDLCheck>
255255
<ConformanceMode>true</ConformanceMode>
@@ -275,7 +275,7 @@
275275
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
276276
<PrecompiledHeader>Use</PrecompiledHeader>
277277
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
278-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
278+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
279279
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
280280
<SDLCheck>true</SDLCheck>
281281
<ConformanceMode>true</ConformanceMode>

‎DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
197197
<PrecompiledHeader>Use</PrecompiledHeader>
198198
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
199-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
199+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
200200
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
201201
<SDLCheck>true</SDLCheck>
202202
<ConformanceMode>true</ConformanceMode>
@@ -223,7 +223,7 @@
223223
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
224224
<PrecompiledHeader>Use</PrecompiledHeader>
225225
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
226-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
226+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
227227
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
228228
<SDLCheck>true</SDLCheck>
229229
<ConformanceMode>true</ConformanceMode>
@@ -250,7 +250,7 @@
250250
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
251251
<PrecompiledHeader>Use</PrecompiledHeader>
252252
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
253-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
253+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
254254
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
255255
<SDLCheck>true</SDLCheck>
256256
<ConformanceMode>true</ConformanceMode>
@@ -277,7 +277,7 @@
277277
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
278278
<PrecompiledHeader>Use</PrecompiledHeader>
279279
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
280-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
280+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
281281
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
282282
<SDLCheck>true</SDLCheck>
283283
<ConformanceMode>true</ConformanceMode>
@@ -303,7 +303,7 @@
303303
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
304304
<PrecompiledHeader>Use</PrecompiledHeader>
305305
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
306-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
306+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
307307
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
308308
<SDLCheck>true</SDLCheck>
309309
<ConformanceMode>true</ConformanceMode>
@@ -330,7 +330,7 @@
330330
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
331331
<PrecompiledHeader>Use</PrecompiledHeader>
332332
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
333-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
333+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
334334
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
335335
<SDLCheck>true</SDLCheck>
336336
<ConformanceMode>true</ConformanceMode>
@@ -358,7 +358,7 @@
358358
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
359359
<PrecompiledHeader>Use</PrecompiledHeader>
360360
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
361-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
361+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
362362
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
363363
<SDLCheck>true</SDLCheck>
364364
<ConformanceMode>true</ConformanceMode>
@@ -384,7 +384,7 @@
384384
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
385385
<PrecompiledHeader>Use</PrecompiledHeader>
386386
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
387-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
387+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
388388
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
389389
<SDLCheck>true</SDLCheck>
390390
<ConformanceMode>true</ConformanceMode>
@@ -411,7 +411,7 @@
411411
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
412412
<PrecompiledHeader>Use</PrecompiledHeader>
413413
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
414-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
414+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
415415
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
416416
<SDLCheck>true</SDLCheck>
417417
<ConformanceMode>true</ConformanceMode>
@@ -437,12 +437,12 @@
437437
</None>
438438
</ItemGroup>
439439
<ItemGroup>
440+
<ClInclude Include="..\Common\d3dx12.h" />
440441
<CLInclude Include="BC.h" />
441442
<ClCompile Include="BC.cpp" />
442443
<ClCompile Include="BC4BC5.cpp" />
443444
<ClCompile Include="BC6HBC7.cpp" />
444445
<ClInclude Include="BCDirectCompute.h" />
445-
<ClInclude Include="d3dx12.h" />
446446
<CLInclude Include="DDS.h" />
447447
<ClInclude Include="filters.h" />
448448
<CLInclude Include="scoped.h" />

‎DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj.filters

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<CLInclude Include="scoped.h">
3737
<Filter>Source Files</Filter>
3838
</CLInclude>
39-
<ClInclude Include="d3dx12.h">
39+
<ClInclude Include="..\Common\d3dx12.h">
4040
<Filter>Source Files</Filter>
4141
</ClInclude>
4242
</ItemGroup>

‎DirectXTex/DirectXTex_Desktop_2022.vcxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
142142
<PrecompiledHeader>Use</PrecompiledHeader>
143143
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
144-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
144+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
145145
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
146146
<SDLCheck>true</SDLCheck>
147147
<ConformanceMode>true</ConformanceMode>
@@ -168,7 +168,7 @@
168168
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169169
<PrecompiledHeader>Use</PrecompiledHeader>
170170
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
171-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
172172
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
173173
<SDLCheck>true</SDLCheck>
174174
<ConformanceMode>true</ConformanceMode>
@@ -195,7 +195,7 @@
195195
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
196196
<PrecompiledHeader>Use</PrecompiledHeader>
197197
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
198-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
198+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
199199
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
200200
<SDLCheck>true</SDLCheck>
201201
<ConformanceMode>true</ConformanceMode>
@@ -221,7 +221,7 @@
221221
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
222222
<PrecompiledHeader>Use</PrecompiledHeader>
223223
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
224-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
224+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
225225
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
226226
<SDLCheck>true</SDLCheck>
227227
<ConformanceMode>true</ConformanceMode>
@@ -249,7 +249,7 @@
249249
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
250250
<PrecompiledHeader>Use</PrecompiledHeader>
251251
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
252-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
252+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
253253
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
254254
<SDLCheck>true</SDLCheck>
255255
<ConformanceMode>true</ConformanceMode>
@@ -275,7 +275,7 @@
275275
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
276276
<PrecompiledHeader>Use</PrecompiledHeader>
277277
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
278-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
278+
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
279279
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
280280
<SDLCheck>true</SDLCheck>
281281
<ConformanceMode>true</ConformanceMode>

0 commit comments

Comments
 (0)