From dc401291a12a639e1910da88e19194321b47e03f Mon Sep 17 00:00:00 2001 From: walbourn_cp Date: Wed, 10 Apr 2013 23:37:19 -0700 Subject: [PATCH] VS 2012 and VS 2010+SDK8.0 projects don't use , they use DirectXMath Fixed DDSView to use DirectXMath when it should --- DDSView/DDSView_Desktop_2010_SDK80.vcxproj | 12 ++++++------ DDSView/DDSView_Desktop_2012.vcxproj | 12 ++++++------ DDSView/ddsview.cpp | 6 +++++- DirectXTex/DirectXTex_Desktop_2012.vcxproj | 6 ------ Texconv/Texconv_Desktop_2010_SDK80.vcxproj | 12 ++++++------ Texconv/Texconv_Desktop_2012.vcxproj | 12 ++++++------ 6 files changed, 29 insertions(+), 31 deletions(-) diff --git a/DDSView/DDSView_Desktop_2010_SDK80.vcxproj b/DDSView/DDSView_Desktop_2010_SDK80.vcxproj index 80e1b8e..2ac6a64 100644 --- a/DDSView/DDSView_Desktop_2010_SDK80.vcxproj +++ b/DDSView/DDSView_Desktop_2010_SDK80.vcxproj @@ -122,7 +122,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EditAndContinue @@ -161,7 +161,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EnableFastChecks @@ -201,7 +201,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -241,7 +241,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -282,7 +282,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -322,7 +322,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) diff --git a/DDSView/DDSView_Desktop_2012.vcxproj b/DDSView/DDSView_Desktop_2012.vcxproj index 5038514..a995e11 100644 --- a/DDSView/DDSView_Desktop_2012.vcxproj +++ b/DDSView/DDSView_Desktop_2012.vcxproj @@ -141,7 +141,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EditAndContinue @@ -180,7 +180,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EnableFastChecks @@ -220,7 +220,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -260,7 +260,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -301,7 +301,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -341,7 +341,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) diff --git a/DDSView/ddsview.cpp b/DDSView/ddsview.cpp index 0db7bdc..3c3feef 100644 --- a/DDSView/ddsview.cpp +++ b/DDSView/ddsview.cpp @@ -12,7 +12,11 @@ #include #include -#include "xnamath.h" +#ifdef USE_XNAMATH +#include +#else +#include +#endif #include "DirectXTex.h" diff --git a/DirectXTex/DirectXTex_Desktop_2012.vcxproj b/DirectXTex/DirectXTex_Desktop_2012.vcxproj index b1f1d02..e77c7ee 100644 --- a/DirectXTex/DirectXTex_Desktop_2012.vcxproj +++ b/DirectXTex/DirectXTex_Desktop_2012.vcxproj @@ -141,7 +141,6 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EditAndContinue @@ -183,7 +182,6 @@ true Fast Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EnableFastChecks @@ -226,7 +224,6 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use @@ -269,7 +266,6 @@ true Fast Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use @@ -313,7 +309,6 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use @@ -356,7 +351,6 @@ true Fast Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use diff --git a/Texconv/Texconv_Desktop_2010_SDK80.vcxproj b/Texconv/Texconv_Desktop_2010_SDK80.vcxproj index 4a72cf7..8bbcd75 100644 --- a/Texconv/Texconv_Desktop_2010_SDK80.vcxproj +++ b/Texconv/Texconv_Desktop_2010_SDK80.vcxproj @@ -122,7 +122,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EditAndContinue @@ -161,7 +161,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EnableFastChecks @@ -201,7 +201,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -241,7 +241,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -282,7 +282,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -322,7 +322,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) diff --git a/Texconv/Texconv_Desktop_2012.vcxproj b/Texconv/Texconv_Desktop_2012.vcxproj index bcf583e..7980edd 100644 --- a/Texconv/Texconv_Desktop_2012.vcxproj +++ b/Texconv/Texconv_Desktop_2012.vcxproj @@ -141,7 +141,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EditAndContinue @@ -180,7 +180,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EnableFastChecks @@ -220,7 +220,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -260,7 +260,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -301,7 +301,7 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) @@ -341,7 +341,7 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)