diff options
author | Rechi <Rechi@users.noreply.github.com> | 2020-02-03 06:42:36 +0100 |
---|---|---|
committer | Rechi <Rechi@users.noreply.github.com> | 2020-02-03 06:42:36 +0100 |
commit | 815f29408cc9038dc57338dfeee62e88f181b792 (patch) | |
tree | 6844b7af98d73031c0cf125cbb6a3d53a3252104 /lib/win32 | |
parent | abdf80721945ff7afb63d14d0a98f7ef079ac0d6 (diff) |
[windows] update Effects11 to April 26, 2019
Diffstat (limited to 'lib/win32')
55 files changed, 383 insertions, 4672 deletions
diff --git a/lib/win32/Effects11/.gitignore b/lib/win32/Effects11/.gitignore deleted file mode 100644 index 4888f95987..0000000000 --- a/lib/win32/Effects11/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -*.psess -*.vsp -*.log -*.err -*.wrn -*.suo -*.sdf -*.user -*.i -*.vspscc -*.opensdf -*.opendb -*.ipch -*.cache -*.tlog -*.lastbuildstate -*.ilk -*.VC.db -/ipch -Bin -/wiki
\ No newline at end of file diff --git a/lib/win32/Effects11/Binary/EffectBinaryFormat.h b/lib/win32/Effects11/Binary/EffectBinaryFormat.h index 0599eabf7f..f6dc192b3e 100644 --- a/lib/win32/Effects11/Binary/EffectBinaryFormat.h +++ b/lib/win32/Effects11/Binary/EffectBinaryFormat.h @@ -5,12 +5,8 @@ // This is the binary file interface shared between the Effects // compiler and runtime. // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- diff --git a/lib/win32/Effects11/Binary/EffectStateBase11.h b/lib/win32/Effects11/Binary/EffectStateBase11.h index 8563d85b58..7363781b99 100644 --- a/lib/win32/Effects11/Binary/EffectStateBase11.h +++ b/lib/win32/Effects11/Binary/EffectStateBase11.h @@ -3,12 +3,8 @@ // // Direct3D 11 Effects States Header // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -31,7 +27,7 @@ struct RValue #define RVALUE_END() { nullptr, 0U } #define RVALUE_ENTRY(prefix, x) { #x, (uint32_t)prefix##x } -enum ELhsType; +enum ELhsType : int; struct LValue { diff --git a/lib/win32/Effects11/Binary/EffectStates11.h b/lib/win32/Effects11/Binary/EffectStates11.h index a47ae409ff..f488050420 100644 --- a/lib/win32/Effects11/Binary/EffectStates11.h +++ b/lib/win32/Effects11/Binary/EffectStates11.h @@ -5,12 +5,8 @@ // This file defines properties of states which can appear in // state blocks and pass blocks. // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- diff --git a/lib/win32/Effects11/Binary/SOParser.h b/lib/win32/Effects11/Binary/SOParser.h index e8ef281f24..0ab54d8786 100644 --- a/lib/win32/Effects11/Binary/SOParser.h +++ b/lib/win32/Effects11/Binary/SOParser.h @@ -3,12 +3,8 @@ // // Direct3D 11 Effects Stream Out Decl Parser // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -36,11 +32,11 @@ class CSOParser char m_pError[ MAX_ERROR_SIZE + 1 ]; // Error buffer public: - CSOParser() + CSOParser() noexcept : + m_newEntry{}, + m_SemanticString{}, + m_pError{} { - ZeroMemory(&m_newEntry, sizeof(m_newEntry)); - ZeroMemory(m_SemanticString, sizeof(m_SemanticString)); - m_pError[0] = 0; } ~CSOParser() diff --git a/lib/win32/Effects11/Effect.h b/lib/win32/Effects11/Effect.h index 3bd16fb6b2..aafea4a4b4 100644 --- a/lib/win32/Effects11/Effect.h +++ b/lib/win32/Effects11/Effect.h @@ -3,12 +3,8 @@ // // Direct3D 11 Effects Header for ID3DX11Effect Implementation // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -66,7 +62,7 @@ struct SConstantBuffer; class CEffect; class CEffectLoader; -enum ELhsType; +enum ELhsType : int; // Allows the use of 32-bit and 64-bit timers depending on platform type typedef size_t Timer; @@ -201,18 +197,18 @@ struct SType : public ID3DX11EffectType }; - SType() : + SType() noexcept : VarType(EVT_Invalid), Elements(0), pTypeName(nullptr), TotalSize(0), Stride(0), - PackedSize(0) + PackedSize(0), + StructType{} { - C_ASSERT( sizeof(NumericType) <= sizeof(StructType) ); - C_ASSERT( sizeof(ObjectType) <= sizeof(StructType) ); - C_ASSERT( sizeof(InterfaceType) <= sizeof(StructType) ); - ZeroMemory( &StructType, sizeof(StructType) ); + static_assert(sizeof(NumericType) <= sizeof(StructType), "SType union issue"); + static_assert(sizeof(ObjectType) <= sizeof(StructType), "SType union issue"); + static_assert(sizeof(InterfaceType) <= sizeof(StructType), "SType union issue"); } bool IsEqual(SType *pOtherType) const; @@ -293,6 +289,11 @@ struct SSingleElementType : public ID3DX11EffectType STDMETHOD_(LPCSTR, GetMemberSemantic)(uint32_t Index) override { return ((SType*)pType)->GetMemberSemantic(Index); } IUNKNOWN_IMP(SSingleElementType, ID3DX11EffectType, IUnknown); + + SSingleElementType() noexcept : + pType(nullptr) + { + } }; ////////////////////////////////////////////////////////////////////////// @@ -310,7 +311,7 @@ struct SBaseBlock uint32_t AssignmentCount; SAssignment *pAssignments; - SBaseBlock(); + SBaseBlock() noexcept; bool ApplyAssignments(CEffect *pEffect); @@ -358,7 +359,7 @@ struct STechnique : public ID3DX11EffectTechnique bool InitiallyValid; bool HasDependencies; - STechnique(); + STechnique() noexcept; STDMETHOD_(bool, IsValid)() override; STDMETHOD(GetDesc)(_Out_ D3DX11_TECHNIQUE_DESC *pDesc) override; @@ -387,7 +388,7 @@ struct SGroup : public ID3DX11EffectGroup bool InitiallyValid; bool HasDependencies; - SGroup(); + SGroup() noexcept; STDMETHOD_(bool, IsValid)() override; STDMETHOD(GetDesc)(_Out_ D3DX11_GROUP_DESC *pDesc) override; @@ -441,7 +442,7 @@ struct SPassBlock : SBaseBlock, public ID3DX11EffectPass bool InitiallyValid; // validity of all state objects and shaders in pass upon BindToDevice bool HasDependencies; // if pass expressions or pass state blocks have dependencies on variables (if true, IsValid != InitiallyValid possibly) - SPassBlock(); + SPassBlock() noexcept; void ApplyPassAssignments(); bool CheckShaderDependencies( _In_ const SShaderBlock* pBlock ); @@ -476,7 +477,7 @@ struct SDepthStencilBlock : SBaseBlock D3D11_DEPTH_STENCIL_DESC BackingStore; bool IsValid; - SDepthStencilBlock(); + SDepthStencilBlock() noexcept; }; struct SBlendBlock : SBaseBlock @@ -485,7 +486,7 @@ struct SBlendBlock : SBaseBlock D3D11_BLEND_DESC BackingStore; bool IsValid; - SBlendBlock(); + SBlendBlock() noexcept; }; struct SRasterizerBlock : SBaseBlock @@ -494,7 +495,7 @@ struct SRasterizerBlock : SBaseBlock D3D11_RASTERIZER_DESC BackingStore; bool IsValid; - SRasterizerBlock(); + SRasterizerBlock() noexcept; }; struct SSamplerBlock : SBaseBlock @@ -507,16 +508,16 @@ struct SSamplerBlock : SBaseBlock SShaderResource *pTexture; } BackingStore; - SSamplerBlock(); + SSamplerBlock() noexcept; }; struct SInterface { SClassInstanceGlobalVariable* pClassInstance; - SInterface() + SInterface() noexcept : + pClassInstance(nullptr) { - pClassInstance = nullptr; } }; @@ -524,36 +525,40 @@ struct SShaderResource { ID3D11ShaderResourceView *pShaderResource; - SShaderResource() + SShaderResource() noexcept : + pShaderResource(nullptr) { - pShaderResource = nullptr; } - }; struct SUnorderedAccessView { ID3D11UnorderedAccessView *pUnorderedAccessView; - SUnorderedAccessView() + SUnorderedAccessView() noexcept : + pUnorderedAccessView(nullptr) { - pUnorderedAccessView = nullptr; } - }; struct SRenderTargetView { ID3D11RenderTargetView *pRenderTargetView; - SRenderTargetView(); + SRenderTargetView() noexcept : + pRenderTargetView(nullptr) + { + } }; struct SDepthStencilView { ID3D11DepthStencilView *pDepthStencilView; - SDepthStencilView(); + SDepthStencilView() noexcept : + pDepthStencilView(nullptr) + { + } }; @@ -565,12 +570,12 @@ template<class T, class D3DTYPE> struct SShaderDependency T *ppFXPointers; // Array of ptrs to FX objects (CBs, SShaderResources, etc) D3DTYPE *ppD3DObjects; // Array of ptrs to matching D3D objects - SShaderDependency() + SShaderDependency() noexcept : + StartIndex(0), + Count(0), + ppFXPointers(nullptr), + ppD3DObjects(nullptr) { - StartIndex = Count = 0; - - ppD3DObjects = nullptr; - ppFXPointers = nullptr; } }; @@ -649,7 +654,7 @@ struct SShaderBlock ID3DBlob *pInputSignatureBlob; // The input signature is separated from the bytecode because it // is always available, even after Optimize() has been called. - SShaderBlock(SD3DShaderVTable *pVirtualTable = nullptr); + SShaderBlock(SD3DShaderVTable *pVirtualTable = nullptr) noexcept; EObjectType GetShaderType(); @@ -676,7 +681,10 @@ struct SString { char *pString; - SString(); + SString() noexcept : + pString(nullptr) + { + } }; @@ -713,7 +721,7 @@ struct SVariable char *pSemantic; uint32_t ExplicitBindPoint; - SVariable() + SVariable() noexcept { ZeroMemory(this, sizeof(*this)); ExplicitBindPoint = uint32_t(-1); @@ -732,7 +740,7 @@ struct SAnonymousShader : public TUncastableVariable<ID3DX11EffectShaderVariable { SShaderBlock *pShaderBlock; - SAnonymousShader(_In_opt_ SShaderBlock *pBlock = nullptr); + SAnonymousShader(_In_opt_ SShaderBlock *pBlock = nullptr) noexcept; // ID3DX11EffectShaderVariable interface STDMETHOD_(bool, IsValid)() override; @@ -820,27 +828,28 @@ struct SConstantBuffer : public TUncastableVariable<ID3DX11EffectConstantBuffer> CEffect *pEffect; - SConstantBuffer() + SConstantBuffer() noexcept : + pD3DObject(nullptr), + TBuffer{}, + pBackingStore(nullptr), + Size(0), + pName(nullptr), + AnnotationCount(0), + pAnnotations(nullptr), + VariableCount(0), + pVariables(nullptr), + ExplicitBindPoint(uint32_t(-1)), + IsDirty(false), + IsTBuffer(false), + IsUserManaged(false), + IsEffectOptimized(false), + IsUsedByExpression(false), + IsUserPacked(false), + IsSingle(false), + IsNonUpdatable(false), + pMemberData(nullptr), + pEffect(nullptr) { - pD3DObject = nullptr; - ZeroMemory(&TBuffer, sizeof(TBuffer)); - ExplicitBindPoint = uint32_t(-1); - pBackingStore = nullptr; - Size = 0; - pName = nullptr; - VariableCount = 0; - pVariables = nullptr; - AnnotationCount = 0; - pAnnotations = nullptr; - IsDirty = false; - IsTBuffer = false; - IsUserManaged = false; - IsEffectOptimized = false; - IsUsedByExpression = false; - IsUserPacked = false; - IsSingle = false; - IsNonUpdatable = false; - pEffect = nullptr; } bool ClonedSingle() const; @@ -927,9 +936,9 @@ struct SAssignment { SGlobalVariable *pVariable; - SDependency() + SDependency() noexcept : + pVariable(nullptr) { - pVariable = nullptr; } }; @@ -958,19 +967,17 @@ struct SAssignment return IsObjectAssignmentHelper(LhsType); } - SAssignment() + SAssignment() noexcept : + LhsType(ELHS_Invalid), + AssignmentType(ERAT_Invalid), + LastRecomputedTime(0), + DependencyCount(0), + pDependencies(nullptr), + Destination{0}, + Source{0}, + DataSize(0), + MaxElements(0) { - LhsType = ELHS_Invalid; - AssignmentType = ERAT_Invalid; - - Destination.pGeneric = nullptr; - Source.pGeneric = nullptr; - - LastRecomputedTime = 0; - DependencyCount = 0; - pDependencies = nullptr; - - DataSize = 0; } }; @@ -1039,7 +1046,7 @@ public: return (pData >= m_pData && pData < (m_pData + m_dwBufferSize)); } - CEffectHeap(); + CEffectHeap() noexcept; ~CEffectHeap(); }; @@ -1201,7 +1208,7 @@ protected: friend struct SConstantBuffer; public: - CEffect( uint32_t Flags = 0 ); + CEffect( uint32_t Flags = 0 ) noexcept; virtual ~CEffect(); void ReleaseShaderRefection(); diff --git a/lib/win32/Effects11/EffectAPI.cpp b/lib/win32/Effects11/EffectAPI.cpp index fd4065cca8..5fd561a5bd 100644 --- a/lib/win32/Effects11/EffectAPI.cpp +++ b/lib/win32/Effects11/EffectAPI.cpp @@ -3,12 +3,8 @@ // // Effect API entry point // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -23,9 +19,9 @@ using namespace D3DX11Effects; struct handle_closer { void operator()(HANDLE h) { if (h) CloseHandle(h); } }; -typedef public std::unique_ptr<void, handle_closer> ScopedHandle; +typedef std::unique_ptr<void, handle_closer> ScopedHandle; -inline HANDLE safe_handle( HANDLE h ) { return (h == INVALID_HANDLE_VALUE) ? 0 : h; } +inline HANDLE safe_handle( HANDLE h ) { return (h == INVALID_HANDLE_VALUE) ? nullptr : h; } //------------------------------------------------------------------------------------- @@ -54,27 +50,20 @@ static HRESULT LoadBinaryFromFile( _In_z_ LPCWSTR pFileName, _Inout_ std::unique } // Get the file size - LARGE_INTEGER FileSize = { 0 }; - -#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) FILE_STANDARD_INFO fileInfo; if ( !GetFileInformationByHandleEx( hFile.get(), FileStandardInfo, &fileInfo, sizeof(fileInfo) ) ) { return HRESULT_FROM_WIN32( GetLastError() ); } - FileSize = fileInfo.EndOfFile; -#else - GetFileSizeEx( hFile.get(), &FileSize ); -#endif // File is too big for 32-bit allocation or contains no data, so reject read - if ( !FileSize.LowPart || FileSize.HighPart > 0) + if ( !fileInfo.EndOfFile.LowPart || fileInfo.EndOfFile.HighPart > 0 ) { return E_FAIL; } // create enough space for the file data - data.reset( new uint8_t[ FileSize.LowPart ] ); + data.reset( new uint8_t[ fileInfo.EndOfFile.LowPart ] ); if (!data) { return E_OUTOFMEMORY; @@ -84,7 +73,7 @@ static HRESULT LoadBinaryFromFile( _In_z_ LPCWSTR pFileName, _Inout_ std::unique DWORD BytesRead = 0; if (!ReadFile( hFile.get(), data.get(), - FileSize.LowPart, + fileInfo.EndOfFile.LowPart, &BytesRead, nullptr )) @@ -92,7 +81,7 @@ static HRESULT LoadBinaryFromFile( _In_z_ LPCWSTR pFileName, _Inout_ std::unique return HRESULT_FROM_WIN32( GetLastError() ); } - if (BytesRead < FileSize.LowPart) + if (BytesRead < fileInfo.EndOfFile.LowPart) { return E_FAIL; } @@ -111,10 +100,8 @@ HRESULT WINAPI D3DX11CreateEffectFromMemory(LPCVOID pData, SIZE_T DataLength, UI if ( !pData || !DataLength || !pDevice || !ppEffect ) return E_INVALIDARG; -#ifdef _M_X64 - if ( DataLength > 0xFFFFFFFF ) + if ( DataLength > UINT32_MAX ) return E_INVALIDARG; -#endif HRESULT hr = S_OK; @@ -288,13 +275,11 @@ HRESULT D3DX11CompileEffectFromFile( LPCWSTR pFileName, #endif // D3D_COMPILER_VERSION -#ifdef _M_X64 - if ( blob->GetBufferSize() > 0xFFFFFFFF ) + if ( blob->GetBufferSize() > UINT32_MAX) { SAFE_RELEASE( blob ); return E_FAIL; } -#endif // _M_X64 hr = S_OK; diff --git a/lib/win32/Effects11/EffectLoad.cpp b/lib/win32/Effects11/EffectLoad.cpp index f64ee0c397..0637eeefbf 100644 --- a/lib/win32/Effects11/EffectLoad.cpp +++ b/lib/win32/Effects11/EffectLoad.cpp @@ -3,12 +3,8 @@ // // Direct3D Effects file loading code // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -186,7 +182,10 @@ inline HRESULT VerifyPointer(uint32_t oBase, uint32_t dwSize, uint32_t dwMaxSize // A simple class which assists in adding data to a block of memory ////////////////////////////////////////////////////////////////////////// -CEffectHeap::CEffectHeap() : m_pData(nullptr), m_dwSize(0), m_dwBufferSize(0) +CEffectHeap::CEffectHeap() noexcept : + m_pData(nullptr), + m_dwSize(0), + m_dwBufferSize(0) { } @@ -394,6 +393,35 @@ lExit: // A helper class which loads an effect ////////////////////////////////////////////////////////////////////////// +CEffectLoader::CEffectLoader() noexcept : + m_pData(nullptr), + m_pHeader(nullptr), + m_Version(0), + m_pEffect(nullptr), + m_pReflection(nullptr), + m_dwBufferSize(0), + m_pOldVars(nullptr), + m_pOldShaders(nullptr), + m_pOldDS(nullptr), + m_pOldAB(nullptr), + m_pOldRS(nullptr), + m_pOldCBs(nullptr), + m_pOldSamplers(nullptr), + m_OldInterfaceCount(0), + m_pOldInterfaces(nullptr), + m_pOldShaderResources(nullptr), + m_pOldUnorderedAccessViews(nullptr), + m_pOldRenderTargetViews(nullptr), + m_pOldDepthStencilViews(nullptr), + m_pOldStrings(nullptr), + m_pOldMemberDataBlocks(nullptr), + m_pvOldMemberInterfaces(nullptr), + m_pOldGroups(nullptr), + m_EffectMemory(0), + m_ReflectionMemory(0) +{ +} + _Use_decl_annotations_ HRESULT CEffectLoader::GetUnstructuredDataBlock(uint32_t offset, uint32_t *pdwSize, void **ppData) { @@ -1787,8 +1815,8 @@ HRESULT CEffectLoader::LoadAssignments( uint32_t Assignments, SAssignment **ppAs // Inline shader assignments must be object types assert(pAssignment->IsObjectAssignment()); - C_ASSERT( offsetof(SBinaryAssignment::SInlineShader,oShader) == offsetof(SBinaryShaderData5,oShader) ); - C_ASSERT( offsetof(SBinaryAssignment::SInlineShader,oSODecl) == offsetof(SBinaryShaderData5,oSODecls) ); + static_assert(offsetof(SBinaryAssignment::SInlineShader, oShader) == offsetof(SBinaryShaderData5, oShader), "ECAT_InlineShader issue"); + static_assert(offsetof(SBinaryAssignment::SInlineShader, oSODecl) == offsetof(SBinaryShaderData5, oSODecls), "ECAT_InlineShader5 issue"); if( psAssignments[i].AssignmentType == ECAT_InlineShader ) { VHD( m_msUnstructured.ReadAtOffset(psAssignments[i].oInitializer, sizeof(*psInlineShader), (void**) &psInlineShader), @@ -2045,8 +2073,8 @@ HRESULT CEffectLoader::LoadObjectVariables() SBinaryShaderData5 *psInlineShader5; }; - C_ASSERT( offsetof(SBinaryGSSOInitializer,oShader) == 0 ); - C_ASSERT( offsetof(SBinaryShaderData5,oShader) == 0 ); + static_assert(offsetof(SBinaryGSSOInitializer, oShader) == 0, "Union issue"); + static_assert(offsetof(SBinaryShaderData5, oShader) == 0, "Union issue"); pShaderBlock = &m_pEffect->m_pShaderBlocks[m_pEffect->m_ShaderBlockCount]; @@ -2622,7 +2650,7 @@ HRESULT CEffectLoader::GrabShaderData(SShaderBlock *pShaderBlock) } else { - DPF(0, "%s: Sampler %s[%u] does not have a texture bound to it, even though the sampler array is used in a DX9-style texture load instruction", g_szEffectLoadArea, pName, j); + DPF(0, "%s: Sampler %s[%zu] does not have a texture bound to it, even though the sampler array is used in a DX9-style texture load instruction", g_szEffectLoadArea, pName, j); } VH( E_FAIL ); diff --git a/lib/win32/Effects11/EffectLoad.h b/lib/win32/Effects11/EffectLoad.h index 238a0b3ae6..6bdb8a2fc9 100644 --- a/lib/win32/Effects11/EffectLoad.h +++ b/lib/win32/Effects11/EffectLoad.h @@ -4,12 +4,8 @@ // Direct3D 11 Effects header for the FX file loader // A CEffectLoader is created at load time to facilitate loading // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -36,6 +32,12 @@ struct SRange uint32_t start; uint32_t last; CEffectVector<void *> vResources; // should be (last - start) in length, resource type depends on the range type + + SRange() noexcept : + start(0), + last(0) + { + } }; // Used during load to validate assignments @@ -77,7 +79,7 @@ protected: SRasterizerBlock *m_pOldRS; SConstantBuffer *m_pOldCBs; SSamplerBlock *m_pOldSamplers; - uint32_t m_OldInterfaceCount; + uint32_t m_OldInterfaceCount; SInterface *m_pOldInterfaces; SShaderResource *m_pOldShaderResources; SUnorderedAccessView *m_pOldUnorderedAccessViews; @@ -147,10 +149,11 @@ protected: HRESULT GetUnstructuredDataBlock(_In_ uint32_t offset, _Out_ uint32_t *pdwSize, _Outptr_result_buffer_(*pdwSize) void **ppData); // This function makes a copy of the array of SInterfaceParameters, but not a copy of the strings HRESULT GetInterfaceParametersAndAddToReflection( _In_ uint32_t InterfaceCount, _In_ uint32_t offset, _Outptr_result_buffer_all_maybenull_(InterfaceCount) SShaderBlock::SInterfaceParameter **ppInterfaces ); + public: + CEffectLoader() noexcept; HRESULT LoadEffect(_In_ CEffect *pEffect, _In_reads_bytes_(cbEffectBuffer) const void *pEffectBuffer, _In_ uint32_t cbEffectBuffer); }; - -}
\ No newline at end of file +} diff --git a/lib/win32/Effects11/EffectNonRuntime.cpp b/lib/win32/Effects11/EffectNonRuntime.cpp index 75114121ce..c2b2014c51 100644 --- a/lib/win32/Effects11/EffectNonRuntime.cpp +++ b/lib/win32/Effects11/EffectNonRuntime.cpp @@ -6,12 +6,8 @@ // are typically called when creating, cloning, or optimizing an // Effect, or reflecting a variable. // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -24,53 +20,52 @@ namespace D3DX11Effects extern SUnorderedAccessView g_NullUnorderedAccessView; -SBaseBlock::SBaseBlock() -: BlockType(EBT_Invalid) -, IsUserManaged(false) -, AssignmentCount(0) -, pAssignments(nullptr) +SBaseBlock::SBaseBlock() noexcept : + BlockType(EBT_Invalid), + IsUserManaged(false), + AssignmentCount(0), + pAssignments(nullptr) { - } -SPassBlock::SPassBlock() +SPassBlock::SPassBlock() noexcept : + BackingStore{}, + pName(nullptr), + AnnotationCount(0), + pAnnotations(nullptr), + pEffect(nullptr), + InitiallyValid(true), + HasDependencies(false) { - pName = nullptr; - AnnotationCount = 0; - pAnnotations = nullptr; - InitiallyValid = true; - HasDependencies = false; - ZeroMemory(&BackingStore, sizeof(BackingStore)); } -STechnique::STechnique() -: pName(nullptr) -, PassCount(0) -, pPasses(nullptr) -, AnnotationCount(0) -, pAnnotations(nullptr) -, InitiallyValid( true ) -, HasDependencies( false ) +STechnique::STechnique() noexcept : + pName(nullptr), + PassCount(0), + pPasses(nullptr), + AnnotationCount(0), + pAnnotations(nullptr), + InitiallyValid( true ), + HasDependencies( false ) { } -SGroup::SGroup() -: pName(nullptr) -, TechniqueCount(0) -, pTechniques(nullptr) -, AnnotationCount(0) -, pAnnotations(nullptr) -, InitiallyValid( true ) -, HasDependencies( false ) +SGroup::SGroup() noexcept : + pName(nullptr), + TechniqueCount(0), + pTechniques(nullptr), + AnnotationCount(0), + pAnnotations(nullptr), + InitiallyValid( true ), + HasDependencies( false ) { } -SDepthStencilBlock::SDepthStencilBlock() +SDepthStencilBlock::SDepthStencilBlock() noexcept : + pDSObject(nullptr), + BackingStore{}, + IsValid(true) { - pDSObject = nullptr; - ZeroMemory(&BackingStore, sizeof(BackingStore)); - IsValid = true; - BackingStore.BackFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; BackingStore.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS; BackingStore.BackFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; @@ -87,12 +82,11 @@ SDepthStencilBlock::SDepthStencilBlock() BackingStore.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK; } -SBlendBlock::SBlendBlock() +SBlendBlock::SBlendBlock() noexcept : + pBlendObject(nullptr), + BackingStore{}, + IsValid(true) { - pBlendObject = nullptr; - ZeroMemory(&BackingStore, sizeof(BackingStore)); - IsValid = true; - BackingStore.AlphaToCoverageEnable = false; BackingStore.IndependentBlendEnable = true; for( size_t i=0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; i++ ) @@ -107,12 +101,11 @@ SBlendBlock::SBlendBlock() } } -SRasterizerBlock::SRasterizerBlock() +SRasterizerBlock::SRasterizerBlock() noexcept : + pRasterizerObject(nullptr), + BackingStore{}, + IsValid(true) { - pRasterizerObject = nullptr; - ZeroMemory(&BackingStore, sizeof(BackingStore)); - IsValid = true; - BackingStore.AntialiasedLineEnable = false; BackingStore.CullMode = D3D11_CULL_BACK; BackingStore.DepthBias = D3D11_DEFAULT_DEPTH_BIAS; @@ -125,11 +118,10 @@ SRasterizerBlock::SRasterizerBlock() BackingStore.DepthClipEnable = true; } -SSamplerBlock::SSamplerBlock() +SSamplerBlock::SSamplerBlock() noexcept : + pD3DObject(nullptr), + BackingStore{} { - pD3DObject = nullptr; - ZeroMemory(&BackingStore, sizeof(BackingStore)); - BackingStore.SamplerDesc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; BackingStore.SamplerDesc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; BackingStore.SamplerDesc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; @@ -145,35 +137,25 @@ SSamplerBlock::SSamplerBlock() BackingStore.SamplerDesc.MaxLOD = FLT_MAX; } -SShaderBlock::SShaderBlock(SD3DShaderVTable *pVirtualTable) +SShaderBlock::SShaderBlock(SD3DShaderVTable *pVirtualTable) noexcept : + IsValid(true), + pVT(pVirtualTable), + pReflectionData(nullptr), + pD3DObject(nullptr), + CBDepCount(0), + pCBDeps(nullptr), + SampDepCount(0), + pSampDeps(nullptr), + InterfaceDepCount(0), + pInterfaceDeps(nullptr), + ResourceDepCount(0), + pResourceDeps(nullptr), + UAVDepCount(0), + pUAVDeps(nullptr), + TBufferDepCount(0), + ppTbufDeps(nullptr), + pInputSignatureBlob(nullptr) { - IsValid = true; - - pVT = pVirtualTable; - - pReflectionData = nullptr; - - pD3DObject = nullptr; - - CBDepCount = 0; - pCBDeps = nullptr; - - SampDepCount = 0; - pSampDeps = nullptr; - - InterfaceDepCount = 0; - pInterfaceDeps = nullptr; - - ResourceDepCount = 0; - pResourceDeps = nullptr; - - UAVDepCount = 0; - pUAVDeps = nullptr; - - TBufferDepCount = 0; - ppTbufDeps = nullptr; - - pInputSignatureBlob = nullptr; } HRESULT SShaderBlock::OnDeviceBind() @@ -540,7 +522,7 @@ HRESULT SShaderBlock::GetSignatureElementDesc(ESigType SigType, uint32_t Element D3D11_SHADER_DESC ShaderDesc; VH( pReflectionData->pReflection->GetDesc( &ShaderDesc ) ); - D3D11_SIGNATURE_PARAMETER_DESC ParamDesc ={0}; + D3D11_SIGNATURE_PARAMETER_DESC ParamDesc ={}; if( pReflectionData->IsNullGS ) { switch( SigType ) @@ -619,21 +601,6 @@ lExit: return hr; } -SString::SString() -{ - pString = nullptr; -} - -SRenderTargetView::SRenderTargetView() -{ - pRenderTargetView = nullptr; -} - -SDepthStencilView::SDepthStencilView() -{ - pDepthStencilView = nullptr; -} - void * GetBlockByIndex(EVarType VarType, EObjectType ObjectType, void *pBaseBlock, uint32_t Index) { switch( VarType ) @@ -709,58 +676,54 @@ void * GetBlockByIndex(EVarType VarType, EObjectType ObjectType, void *pBaseBloc // CEffect //-------------------------------------------------------------------------------------- -CEffect::CEffect( uint32_t Flags ) +CEffect::CEffect( uint32_t Flags ) noexcept : + m_RefCount(1), + m_Flags(Flags), + m_pReflection(nullptr), + m_VariableCount(0), + m_pVariables(nullptr), + m_AnonymousShaderCount(0), + m_pAnonymousShaders(nullptr), + m_TechniqueCount(0), + m_GroupCount(0), + m_pGroups(nullptr), + m_pNullGroup(nullptr), + m_ShaderBlockCount(0), + m_pShaderBlocks(nullptr), + m_DepthStencilBlockCount(0), + m_pDepthStencilBlocks(nullptr), + m_BlendBlockCount(0), + m_pBlendBlocks(nullptr), + m_RasterizerBlockCount(0), + m_pRasterizerBlocks(nullptr), + m_SamplerBlockCount(0), + m_pSamplerBlocks(nullptr), + m_MemberDataCount(0), + m_pMemberDataBlocks(nullptr), + m_InterfaceCount(0), + m_pInterfaces(nullptr), + m_CBCount(0), + m_pCBs(nullptr), + m_StringCount(0), + m_pStrings(nullptr), + m_ShaderResourceCount(0), + m_pShaderResources(nullptr), + m_UnorderedAccessViewCount(0), + m_pUnorderedAccessViews(nullptr), + m_RenderTargetViewCount(0), + m_pRenderTargetViews(nullptr), + m_DepthStencilViewCount(0), + m_pDepthStencilViews(nullptr), + m_LocalTimer(1), + m_FXLIndex(0), + m_pDevice(nullptr), + m_pContext(nullptr), + m_pClassLinkage(nullptr), + m_pTypePool(nullptr), + m_pStringPool(nullptr), + m_pPooledHeap(nullptr), + m_pOptimizedTypeHeap(nullptr) { - m_RefCount = 1; - - m_pVariables = nullptr; - m_pAnonymousShaders = nullptr; - m_pGroups = nullptr; - m_pNullGroup = nullptr; - m_pShaderBlocks = nullptr; - m_pDepthStencilBlocks = nullptr; - m_pBlendBlocks = nullptr; - m_pRasterizerBlocks = nullptr; - m_pSamplerBlocks = nullptr; - m_pCBs = nullptr; - m_pStrings = nullptr; - m_pMemberDataBlocks = nullptr; - m_pInterfaces = nullptr; - m_pShaderResources = nullptr; - m_pUnorderedAccessViews = nullptr; - m_pRenderTargetViews = nullptr; - m_pDepthStencilViews = nullptr; - m_pDevice = nullptr; - m_pClassLinkage = nullptr; - m_pContext = nullptr; - - m_VariableCount = 0; - m_AnonymousShaderCount = 0; - m_ShaderBlockCount = 0; - m_DepthStencilBlockCount = 0; - m_BlendBlockCount = 0; - m_RasterizerBlockCount = 0; - m_SamplerBlockCount = 0; - m_StringCount = 0; - m_MemberDataCount = 0; - m_InterfaceCount = 0; - m_ShaderResourceCount = 0; - m_UnorderedAccessViewCount = 0; - m_RenderTargetViewCount = 0; - m_DepthStencilViewCount = 0; - m_CBCount = 0; - m_TechniqueCount = 0; - m_GroupCount = 0; - - m_pReflection = nullptr; - m_LocalTimer = 1; - m_Flags = Flags; - m_FXLIndex = 0; - - m_pTypePool = nullptr; - m_pStringPool = nullptr; - m_pPooledHeap = nullptr; - m_pOptimizedTypeHeap = nullptr; } void CEffect::ReleaseShaderRefection() @@ -789,9 +752,8 @@ CEffect::~CEffect() if (pInfoQueue) { - D3D11_INFO_QUEUE_FILTER filter; + D3D11_INFO_QUEUE_FILTER filter = {}; D3D11_MESSAGE_CATEGORY messageCategory = D3D11_MESSAGE_CATEGORY_STATE_SETTING; - ZeroMemory(&filter, sizeof(filter)); filter.DenyList.NumCategories = 1; filter.DenyList.pCategoryList = &messageCategory; diff --git a/lib/win32/Effects11/EffectReflection.cpp b/lib/win32/Effects11/EffectReflection.cpp index 4ed057b98b..b4207e0a82 100644 --- a/lib/win32/Effects11/EffectReflection.cpp +++ b/lib/win32/Effects11/EffectReflection.cpp @@ -3,13 +3,8 @@ // // Direct3D 11 Effects public reflection APIs // -// -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -601,7 +596,8 @@ lExit: // ID3DX11EffectShaderVariable (SAnonymousShader implementation) //////////////////////////////////////////////////////////////////////////////// -SAnonymousShader::SAnonymousShader(_In_opt_ SShaderBlock *pBlock) : pShaderBlock(pBlock) +SAnonymousShader::SAnonymousShader(_In_opt_ SShaderBlock *pBlock) noexcept : + pShaderBlock(pBlock) { } @@ -2107,7 +2103,7 @@ ID3DX11EffectTechnique * CEffect::GetTechniqueByName(_In_z_ LPCSTR Name) if( FAILED( strcpy_s( NameCopy, MAX_GROUP_TECHNIQUE_SIZE, Name ) ) ) { - DPF( 0, "Group|Technique name has a length greater than %u.", MAX_GROUP_TECHNIQUE_SIZE ); + DPF( 0, "Group|Technique name has a length greater than %zu.", MAX_GROUP_TECHNIQUE_SIZE ); return &g_InvalidTechnique; } diff --git a/lib/win32/Effects11/EffectRuntime.cpp b/lib/win32/Effects11/EffectRuntime.cpp index fcbfb17dc2..4ef83e5455 100644 --- a/lib/win32/Effects11/EffectRuntime.cpp +++ b/lib/win32/Effects11/EffectRuntime.cpp @@ -5,12 +5,8 @@ // These functions are expected to be called at high frequency // (when applying a pass). // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -643,11 +639,11 @@ void CEffect::IncrementTimer() { m_LocalTimer++; -#ifndef _M_X64 +#if !defined(_M_X64) && !defined(_M_ARM64) #if _DEBUG if (m_LocalTimer > g_TimerRolloverCount) { - DPF(0, "Rolling over timer (current time: %u, rollover cap: %u).", m_LocalTimer, g_TimerRolloverCount); + DPF(0, "Rolling over timer (current time: %zu, rollover cap: %u).", m_LocalTimer, g_TimerRolloverCount); #else if (m_LocalTimer >= 0x80000000) // check to see if we've exceeded ~2 billion { diff --git a/lib/win32/Effects11/EffectVariable.inl b/lib/win32/Effects11/EffectVariable.inl index fdafb2abea..fbcb4fe560 100644 --- a/lib/win32/Effects11/EffectVariable.inl +++ b/lib/win32/Effects11/EffectVariable.inl @@ -4,12 +4,8 @@ // Direct3D 11 Effects Variable reflection template // These templates define the many Effect variable types. // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -1185,7 +1181,8 @@ struct TTopLevelVariable : public SVariable, public IBaseInterface return pEffect; } - TTopLevelVariable() : pEffect (nullptr) + TTopLevelVariable() noexcept : + pEffect(nullptr) { } @@ -1224,10 +1221,10 @@ struct TMember : public SVariable, public IBaseInterface // Required to create member/element variable interfaces TTopLevelVariable<ID3DX11EffectVariable> *pTopLevelEntity; - TMember() + TMember() noexcept : + IsSingleElement(false), + pTopLevelEntity(nullptr) { - IsSingleElement = false; - pTopLevelEntity = nullptr; } CEffect* GetEffect() @@ -1394,10 +1391,10 @@ struct TGlobalVariable : public TVariable<TTopLevelVariable<IBaseInterface> > // if numeric, pointer to the constant buffer where this variable lives SConstantBuffer *pCB; - uint32_t AnnotationCount; + uint32_t AnnotationCount; SAnnotation *pAnnotations; - TGlobalVariable() : + TGlobalVariable() noexcept : LastModifiedTime(0), pCB(nullptr), AnnotationCount(0), diff --git a/lib/win32/Effects11/Effects11_2010_DXSDK.sln b/lib/win32/Effects11/Effects11_2010_DXSDK.sln deleted file mode 100644 index 7fb8ca45e6..0000000000 --- a/lib/win32/Effects11/Effects11_2010_DXSDK.sln +++ /dev/null @@ -1,31 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2010_DXSDK.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Profile|Win32 = Profile|Win32 - Profile|x64 = Profile|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib/win32/Effects11/Effects11_2010_DXSDK.vcxproj b/lib/win32/Effects11/Effects11_2010_DXSDK.vcxproj deleted file mode 100644 index c510b4ec95..0000000000 --- a/lib/win32/Effects11/Effects11_2010_DXSDK.vcxproj +++ /dev/null @@ -1,412 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -<ItemGroup Label="ProjectConfigurations"> -<ProjectConfiguration Include="Debug|Win32"> -<Configuration>Debug</Configuration> -<Platform>Win32</Platform> -</ProjectConfiguration> -<ProjectConfiguration Include="Debug|x64"> -<Configuration>Debug</Configuration> -<Platform>x64</Platform> -</ProjectConfiguration> -<ProjectConfiguration Include="Profile|Win32"> -<Configuration>Profile</Configuration> -<Platform>Win32</Platform> -</ProjectConfiguration> -<ProjectConfiguration Include="Profile|x64"> -<Configuration>Profile</Configuration> -<Platform>x64</Platform> -</ProjectConfiguration> -<ProjectConfiguration Include="Release|Win32"> -<Configuration>Release</Configuration> -<Platform>Win32</Platform> -</ProjectConfiguration> -<ProjectConfiguration Include="Release|x64"> -<Configuration>Release</Configuration> -<Platform>x64</Platform> -</ProjectConfiguration> -</ItemGroup> -<PropertyGroup Label="Globals"> -<ProjectName>Effects11</ProjectName> -<ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid> -<RootNamespace>Effects11</RootNamespace> -<Keyword>Win32Proj</Keyword> -</PropertyGroup> -<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> -<ConfigurationType>StaticLibrary</ConfigurationType> -<CharacterSet>Unicode</CharacterSet> -</PropertyGroup> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration"> -<ConfigurationType>StaticLibrary</ConfigurationType> -<CharacterSet>Unicode</CharacterSet> -</PropertyGroup> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -<ConfigurationType>StaticLibrary</ConfigurationType> -<WholeProgramOptimization>true</WholeProgramOptimization> -<CharacterSet>Unicode</CharacterSet> -</PropertyGroup> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration"> -<ConfigurationType>StaticLibrary</ConfigurationType> -<WholeProgramOptimization>true</WholeProgramOptimization> -<CharacterSet>Unicode</CharacterSet> -</PropertyGroup> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration"> -<ConfigurationType>StaticLibrary</ConfigurationType> -<WholeProgramOptimization>true</WholeProgramOptimization> -<CharacterSet>Unicode</CharacterSet> -</PropertyGroup> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration"> -<ConfigurationType>StaticLibrary</ConfigurationType> -<WholeProgramOptimization>true</WholeProgramOptimization> -<CharacterSet>Unicode</CharacterSet> -</PropertyGroup> -<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -<ImportGroup Label="ExtensionSettings" /> -<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets"> -<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -</ImportGroup> -<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> -<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -</ImportGroup> -<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> -<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -</ImportGroup> -<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets"> -<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -</ImportGroup> -<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> -<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -</ImportGroup> -<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> -<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -</ImportGroup> -<PropertyGroup Label="UserMacros" /> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> -<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath> -<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath> -<LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath> -</PropertyGroup> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> - <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> -<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath> -<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath> -<LibraryPath>$(DXSDK_DIR)Lib\x64;$(LibraryPath)</LibraryPath> -</PropertyGroup> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> -<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath> -<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath> -<LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath> -</PropertyGroup> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> - <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> -<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath> -<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath> -<LibraryPath>$(DXSDK_DIR)Lib\x64;$(LibraryPath)</LibraryPath> -</PropertyGroup> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> -<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath> -<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath> -<LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath> -</PropertyGroup> -<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> - <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> -<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath> -<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath> -<LibraryPath>$(DXSDK_DIR)Lib\x64;$(LibraryPath)</LibraryPath> -</PropertyGroup> -<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -<ClCompile> -<WarningLevel>Level4</WarningLevel> -<Optimization>Disabled</Optimization> -<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> -<OpenMPSupport>false</OpenMPSupport> -<IntrinsicFunctions>true</IntrinsicFunctions> -<FloatingPointModel>Fast</FloatingPointModel> -<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> -<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> -<ExceptionHandling>Sync</ExceptionHandling> -<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> -<DebugInformationFormat>EditAndContinue</DebugInformationFormat> -<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> -<PrecompiledHeader>Use</PrecompiledHeader> -</ClCompile> -<Link> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> -<SubSystem>Windows</SubSystem> -<GenerateDebugInformation>true</GenerateDebugInformation> -<LargeAddressAware>true</LargeAddressAware> -<RandomizedBaseAddress>true</RandomizedBaseAddress> -<DataExecutionPrevention>true</DataExecutionPrevention> -<TargetMachine>MachineX86</TargetMachine> -<UACExecutionLevel>AsInvoker</UACExecutionLevel> -<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> -</Link> -<Manifest> -<EnableDPIAwareness>false</EnableDPIAwareness> -</Manifest> -<PreBuildEvent> -<Command></Command> -</PreBuildEvent> -<PostBuildEvent> -<Command></Command> -</PostBuildEvent> -</ItemDefinitionGroup> -<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> -<ClCompile> -<WarningLevel>Level4</WarningLevel> -<Optimization>Disabled</Optimization> -<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> -<OpenMPSupport>false</OpenMPSupport> -<IntrinsicFunctions>true</IntrinsicFunctions> -<FloatingPointModel>Fast</FloatingPointModel> -<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> -<ExceptionHandling>Sync</ExceptionHandling> -<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> -<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> -<PrecompiledHeader>Use</PrecompiledHeader> -</ClCompile> -<Link> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> -<SubSystem>Windows</SubSystem> -<GenerateDebugInformation>true</GenerateDebugInformation> -<LargeAddressAware>true</LargeAddressAware> -<RandomizedBaseAddress>true</RandomizedBaseAddress> -<DataExecutionPrevention>true</DataExecutionPrevention> -<TargetMachine>MachineX64</TargetMachine> -<UACExecutionLevel>AsInvoker</UACExecutionLevel> -<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> -</Link> -<Manifest> -<EnableDPIAwareness>false</EnableDPIAwareness> -</Manifest> -<PreBuildEvent> -<Command></Command> -</PreBuildEvent> -<PostBuildEvent> -<Command></Command> -</PostBuildEvent> -</ItemDefinitionGroup> -<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -<ClCompile> -<WarningLevel>Level4</WarningLevel> -<Optimization>MaxSpeed</Optimization> -<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> -<OpenMPSupport>false</OpenMPSupport> -<FunctionLevelLinking>true</FunctionLevelLinking> -<IntrinsicFunctions>true</IntrinsicFunctions> -<FloatingPointModel>Fast</FloatingPointModel> -<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> -<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> -<ExceptionHandling>Sync</ExceptionHandling> -<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> -<PrecompiledHeader>Use</PrecompiledHeader> -</ClCompile> -<Link> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> -<GenerateDebugInformation>true</GenerateDebugInformation> -<SubSystem>Windows</SubSystem> -<OptimizeReferences>true</OptimizeReferences> -<EnableCOMDATFolding>true</EnableCOMDATFolding> -<LargeAddressAware>true</LargeAddressAware> -<RandomizedBaseAddress>true</RandomizedBaseAddress> -<DataExecutionPrevention>true</DataExecutionPrevention> -<TargetMachine>MachineX86</TargetMachine> -<UACExecutionLevel>AsInvoker</UACExecutionLevel> -<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> -</Link> -<Manifest> -<EnableDPIAwareness>false</EnableDPIAwareness> -</Manifest> -<PreBuildEvent> -<Command></Command> -</PreBuildEvent> -<PostBuildEvent> -<Command></Command> -</PostBuildEvent> -</ItemDefinitionGroup> -<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> -<ClCompile> -<WarningLevel>Level4</WarningLevel> -<Optimization>MaxSpeed</Optimization> -<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> -<OpenMPSupport>false</OpenMPSupport> -<FunctionLevelLinking>true</FunctionLevelLinking> -<IntrinsicFunctions>true</IntrinsicFunctions> -<FloatingPointModel>Fast</FloatingPointModel> -<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> -<ExceptionHandling>Sync</ExceptionHandling> -<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> -<PrecompiledHeader>Use</PrecompiledHeader> -</ClCompile> -<Link> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> -<GenerateDebugInformation>true</GenerateDebugInformation> -<SubSystem>Windows</SubSystem> -<OptimizeReferences>true</OptimizeReferences> -<EnableCOMDATFolding>true</EnableCOMDATFolding> -<LargeAddressAware>true</LargeAddressAware> -<RandomizedBaseAddress>true</RandomizedBaseAddress> -<DataExecutionPrevention>true</DataExecutionPrevention> -<TargetMachine>MachineX64</TargetMachine> -<UACExecutionLevel>AsInvoker</UACExecutionLevel> -<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> -</Link> -<Manifest> -<EnableDPIAwareness>false</EnableDPIAwareness> -</Manifest> -<PreBuildEvent> -<Command></Command> -</PreBuildEvent> -<PostBuildEvent> -<Command></Command> -</PostBuildEvent> -</ItemDefinitionGroup> -<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> -<ClCompile> -<WarningLevel>Level4</WarningLevel> -<Optimization>MaxSpeed</Optimization> -<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> -<OpenMPSupport>false</OpenMPSupport> -<FunctionLevelLinking>true</FunctionLevelLinking> -<IntrinsicFunctions>true</IntrinsicFunctions> -<FloatingPointModel>Fast</FloatingPointModel> -<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> -<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> -<ExceptionHandling>Sync</ExceptionHandling> -<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> -<PrecompiledHeader>Use</PrecompiledHeader> -</ClCompile> -<Link> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> -<GenerateDebugInformation>true</GenerateDebugInformation> -<SubSystem>Windows</SubSystem> -<OptimizeReferences>true</OptimizeReferences> -<EnableCOMDATFolding>true</EnableCOMDATFolding> -<LargeAddressAware>true</LargeAddressAware> -<RandomizedBaseAddress>true</RandomizedBaseAddress> -<DataExecutionPrevention>true</DataExecutionPrevention> -<TargetMachine>MachineX86</TargetMachine> -<UACExecutionLevel>AsInvoker</UACExecutionLevel> -<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> -</Link> -<Manifest> -<EnableDPIAwareness>false</EnableDPIAwareness> -</Manifest> -<PreBuildEvent> -<Command></Command> -</PreBuildEvent> -<PostBuildEvent> -<Command></Command> -</PostBuildEvent> -</ItemDefinitionGroup> -<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> -<ClCompile> -<WarningLevel>Level4</WarningLevel> -<Optimization>MaxSpeed</Optimization> -<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> -<OpenMPSupport>false</OpenMPSupport> -<FunctionLevelLinking>true</FunctionLevelLinking> -<IntrinsicFunctions>true</IntrinsicFunctions> -<FloatingPointModel>Fast</FloatingPointModel> -<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> -<ExceptionHandling>Sync</ExceptionHandling> -<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> -<PrecompiledHeader>Use</PrecompiledHeader> -</ClCompile> -<Link> -<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> -<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> -<GenerateDebugInformation>true</GenerateDebugInformation> -<SubSystem>Windows</SubSystem> -<OptimizeReferences>true</OptimizeReferences> -<EnableCOMDATFolding>true</EnableCOMDATFolding> -<LargeAddressAware>true</LargeAddressAware> -<RandomizedBaseAddress>true</RandomizedBaseAddress> -<DataExecutionPrevention>true</DataExecutionPrevention> -<TargetMachine>MachineX64</TargetMachine> -<UACExecutionLevel>AsInvoker</UACExecutionLevel> -<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> -</Link> -<Manifest> -<EnableDPIAwareness>false</EnableDPIAwareness> -</Manifest> -<PreBuildEvent> -<Command></Command> -</PreBuildEvent> -<PostBuildEvent> -<Command></Command> -</PostBuildEvent> -</ItemDefinitionGroup> -<ItemGroup /> -<ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader> - </ClCompile> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> -<ItemGroup></ItemGroup> -<ItemGroup></ItemGroup> -<ItemGroup></ItemGroup> -<ItemGroup></ItemGroup> -<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -<ImportGroup Label="ExtensionTargets" /> -</Project> diff --git a/lib/win32/Effects11/Effects11_2010_DXSDK.vcxproj.filters b/lib/win32/Effects11/Effects11_2010_DXSDK.vcxproj.filters deleted file mode 100644 index 37cfab9499..0000000000 --- a/lib/win32/Effects11/Effects11_2010_DXSDK.vcxproj.filters +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -<ItemGroup> -<Filter Include="Resource Files"> -<UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier> -<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> -</Filter> -</ItemGroup> -<ItemGroup /> -<ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp" /> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> -<ItemGroup></ItemGroup> -<ItemGroup></ItemGroup> -<ItemGroup></ItemGroup> -</Project> diff --git a/lib/win32/Effects11/Effects11_2010_SDK81.sln b/lib/win32/Effects11/Effects11_2010_SDK81.sln deleted file mode 100644 index 3ea8d2591f..0000000000 --- a/lib/win32/Effects11/Effects11_2010_SDK81.sln +++ /dev/null @@ -1,31 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2010_SDK81.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Profile|Win32 = Profile|Win32 - Profile|x64 = Profile|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib/win32/Effects11/Effects11_2010_SDK81.vcxproj b/lib/win32/Effects11/Effects11_2010_SDK81.vcxproj deleted file mode 100644 index f98bb5e391..0000000000 --- a/lib/win32/Effects11/Effects11_2010_SDK81.vcxproj +++ /dev/null @@ -1,417 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Profile|Win32"> - <Configuration>Profile</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Profile|x64"> - <Configuration>Profile</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectName>Effects11</ProjectName> - <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid> - <RootNamespace>Effects11</RootNamespace> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v100</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings" /> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Windows81SDK_x86.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Windows81SDK_x86.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Windows81SDK_x86.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Windows81SDK_x64.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Windows81SDK_x64.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Windows81SDK_x64.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> - <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> - <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> - <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>Disabled</Optimization> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>Disabled</Optimization> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemGroup /> - <ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader> - </ClCompile> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets" /> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_2010_SDK81.vcxproj.filters b/lib/win32/Effects11/Effects11_2010_SDK81.vcxproj.filters deleted file mode 100644 index 37cfab9499..0000000000 --- a/lib/win32/Effects11/Effects11_2010_SDK81.vcxproj.filters +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -<ItemGroup> -<Filter Include="Resource Files"> -<UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier> -<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> -</Filter> -</ItemGroup> -<ItemGroup /> -<ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp" /> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> -<ItemGroup></ItemGroup> -<ItemGroup></ItemGroup> -<ItemGroup></ItemGroup> -</Project> diff --git a/lib/win32/Effects11/Effects11_2012.sln b/lib/win32/Effects11/Effects11_2012.sln deleted file mode 100644 index 5a0d35259b..0000000000 --- a/lib/win32/Effects11/Effects11_2012.sln +++ /dev/null @@ -1,31 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2012.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Profile|Win32 = Profile|Win32 - Profile|x64 = Profile|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib/win32/Effects11/Effects11_2012.vcxproj b/lib/win32/Effects11/Effects11_2012.vcxproj deleted file mode 100644 index b7199167f6..0000000000 --- a/lib/win32/Effects11/Effects11_2012.vcxproj +++ /dev/null @@ -1,423 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Profile|Win32"> - <Configuration>Profile</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Profile|x64"> - <Configuration>Profile</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectName>Effects11</ProjectName> - <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid> - <RootNamespace>Effects11</RootNamespace> - <Keyword>Win32Proj</Keyword> - <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings" /> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> - <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> - <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> - <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>Disabled</Optimization> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>Disabled</Optimization> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemGroup /> - <ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader> - </ClCompile> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets" /> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_2012.vcxproj.filters b/lib/win32/Effects11/Effects11_2012.vcxproj.filters deleted file mode 100644 index c49ec9dff9..0000000000 --- a/lib/win32/Effects11/Effects11_2012.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Resource Files"> - <UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> - </Filter> - </ItemGroup> - <ItemGroup /> - <ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp" /> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_2013.sln b/lib/win32/Effects11/Effects11_2013.sln deleted file mode 100644 index db7e3e36b5..0000000000 --- a/lib/win32/Effects11/Effects11_2013.sln +++ /dev/null @@ -1,31 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2013.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Profile|Win32 = Profile|Win32 - Profile|x64 = Profile|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib/win32/Effects11/Effects11_2013.vcxproj b/lib/win32/Effects11/Effects11_2013.vcxproj deleted file mode 100644 index c2af09dcd4..0000000000 --- a/lib/win32/Effects11/Effects11_2013.vcxproj +++ /dev/null @@ -1,419 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Profile|Win32"> - <Configuration>Profile</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Profile|x64"> - <Configuration>Profile</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectName>Effects11</ProjectName> - <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid> - <RootNamespace>Effects11</RootNamespace> - <Keyword>Win32Proj</Keyword> - <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings" /> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> - <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> - <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> - <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>Disabled</Optimization> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>Disabled</Optimization> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemGroup /> - <ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader> - </ClCompile> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets" /> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_2013.vcxproj.filters b/lib/win32/Effects11/Effects11_2013.vcxproj.filters deleted file mode 100644 index c49ec9dff9..0000000000 --- a/lib/win32/Effects11/Effects11_2013.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Resource Files"> - <UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> - </Filter> - </ItemGroup> - <ItemGroup /> - <ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp" /> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_2015.sln b/lib/win32/Effects11/Effects11_2015.sln deleted file mode 100644 index 9d0fe58519..0000000000 --- a/lib/win32/Effects11/Effects11_2015.sln +++ /dev/null @@ -1,31 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2015.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Profile|Win32 = Profile|Win32 - Profile|x64 = Profile|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib/win32/Effects11/Effects11_2015.vcxproj b/lib/win32/Effects11/Effects11_2015.vcxproj deleted file mode 100644 index a61c3fa3e0..0000000000 --- a/lib/win32/Effects11/Effects11_2015.vcxproj +++ /dev/null @@ -1,418 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Profile|Win32"> - <Configuration>Profile</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Profile|x64"> - <Configuration>Profile</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectName>Effects11</ProjectName> - <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid> - <RootNamespace>Effects11</RootNamespace> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings" /> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> - <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> - <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> - <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>Disabled</Optimization> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>Disabled</Optimization> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemGroup /> - <ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader> - </ClCompile> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets" /> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_2015.vcxproj.filters b/lib/win32/Effects11/Effects11_2015.vcxproj.filters deleted file mode 100644 index c49ec9dff9..0000000000 --- a/lib/win32/Effects11/Effects11_2015.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Resource Files"> - <UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> - </Filter> - </ItemGroup> - <ItemGroup /> - <ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp" /> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_2015_Win10.sln b/lib/win32/Effects11/Effects11_2015_Win10.sln deleted file mode 100644 index 75fb9454cb..0000000000 --- a/lib/win32/Effects11/Effects11_2015_Win10.sln +++ /dev/null @@ -1,31 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2015_Win10.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Profile|Win32 = Profile|Win32 - Profile|x64 = Profile|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64 - {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib/win32/Effects11/Effects11_2015_Win10.vcxproj b/lib/win32/Effects11/Effects11_2015_Win10.vcxproj deleted file mode 100644 index 272917fa79..0000000000 --- a/lib/win32/Effects11/Effects11_2015_Win10.vcxproj +++ /dev/null @@ -1,419 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Profile|Win32"> - <Configuration>Profile</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Profile|x64"> - <Configuration>Profile</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectName>Effects11</ProjectName> - <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid> - <RootNamespace>Effects11</RootNamespace> - <Keyword>Win32Proj</Keyword> - <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings" /> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> - <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> - <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> - <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>Disabled</Optimization> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>Disabled</Optimization> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> - <ClCompile> - <WarningLevel>Level4</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>false</OpenMPSupport> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FloatingPointModel>Fast</FloatingPointModel> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <ExceptionHandling>Sync</ExceptionHandling> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PrecompiledHeader>Use</PrecompiledHeader> - </ClCompile> - <Link> - <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <LargeAddressAware>true</LargeAddressAware> - <RandomizedBaseAddress>true</RandomizedBaseAddress> - <DataExecutionPrevention>true</DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - <UACExecutionLevel>AsInvoker</UACExecutionLevel> - <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> - </Link> - <Manifest> - <EnableDPIAwareness>false</EnableDPIAwareness> - </Manifest> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - <PostBuildEvent> - <Command> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemGroup /> - <ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader> - </ClCompile> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets" /> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_2015_Win10.vcxproj.filters b/lib/win32/Effects11/Effects11_2015_Win10.vcxproj.filters deleted file mode 100644 index c49ec9dff9..0000000000 --- a/lib/win32/Effects11/Effects11_2015_Win10.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Resource Files"> - <UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> - </Filter> - </ItemGroup> - <ItemGroup /> - <ItemGroup> - <CLInclude Include="pchfx.h" /> - <CLInclude Include=".\Inc\d3dx11effect.h" /> - <CLInclude Include=".\Inc\d3dxglobal.h" /> - <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> - <CLInclude Include=".\Binary\EffectStateBase11.h" /> - <CLInclude Include=".\Binary\EffectStates11.h" /> - <CLInclude Include=".\Binary\SOParser.h" /> - <ClCompile Include="d3dxGlobal.cpp" /> - <CLInclude Include="Effect.h" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <CLInclude Include="EffectLoad.h" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - <None Include="EffectVariable.inl" /> - <CLInclude Include="IUnknownImp.h" /> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_Windows10.sln b/lib/win32/Effects11/Effects11_Windows10.sln deleted file mode 100644 index 49848ccb1b..0000000000 --- a/lib/win32/Effects11/Effects11_Windows10.sln +++ /dev/null @@ -1,34 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.22609.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_Windows10.vcxproj", "{9188BD60-F60C-4A40-98CF-F704E467D775}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|ARM = Release|ARM - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|ARM.ActiveCfg = Debug|ARM - {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|ARM.Build.0 = Debug|ARM - {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x64.ActiveCfg = Debug|x64 - {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x64.Build.0 = Debug|x64 - {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x86.ActiveCfg = Debug|Win32 - {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x86.Build.0 = Debug|Win32 - {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|ARM.ActiveCfg = Release|ARM - {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|ARM.Build.0 = Release|ARM - {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x64.ActiveCfg = Release|x64 - {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x64.Build.0 = Release|x64 - {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x86.ActiveCfg = Release|Win32 - {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib/win32/Effects11/Effects11_Windows10.vcxproj b/lib/win32/Effects11/Effects11_Windows10.vcxproj deleted file mode 100644 index 4e4a88f0bf..0000000000 --- a/lib/win32/Effects11/Effects11_Windows10.vcxproj +++ /dev/null @@ -1,257 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Binary\EffectBinaryFormat.h" /> - <ClInclude Include="Binary\EffectStateBase11.h" /> - <ClInclude Include="Binary\EffectStates11.h" /> - <ClInclude Include="Binary\SOParser.h" /> - <ClInclude Include="Effect.h" /> - <ClInclude Include="EffectLoad.h" /> - <ClInclude Include="inc\d3dx11effect.h" /> - <ClInclude Include="inc\d3dxGlobal.h" /> - <ClInclude Include="IUnknownImp.h" /> - <ClInclude Include="pchfx.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="d3dxGlobal.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> - </ClCompile> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - </ItemGroup> - <ItemGroup> - <None Include="EffectVariable.inl" /> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{9188bd60-f60c-4a40-98cf-f704e467d775}</ProjectGuid> - <Keyword>StaticLibrary</Keyword> - <ProjectName>Effects11</ProjectName> - <RootNamespace>Effects11</RootNamespace> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Store</ApplicationType> - <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> - <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion> - <ApplicationTypeRevision>10.0</ApplicationTypeRevision> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_Windows10.vcxproj.filters b/lib/win32/Effects11/Effects11_Windows10.vcxproj.filters deleted file mode 100644 index 3fa56c5eba..0000000000 --- a/lib/win32/Effects11/Effects11_Windows10.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="Binary\EffectBinaryFormat.h" /> - <ClInclude Include="Binary\EffectStateBase11.h" /> - <ClInclude Include="Binary\EffectStates11.h" /> - <ClInclude Include="Binary\SOParser.h" /> - <ClInclude Include="inc\d3dx11effect.h" /> - <ClInclude Include="inc\d3dxGlobal.h" /> - <ClInclude Include="Effect.h" /> - <ClInclude Include="EffectLoad.h" /> - <ClInclude Include="IUnknownImp.h" /> - <ClInclude Include="pchfx.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="d3dxGlobal.cpp" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - </ItemGroup> - <ItemGroup> - <None Include="EffectVariable.inl" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_Windows81.sln b/lib/win32/Effects11/Effects11_Windows81.sln deleted file mode 100644 index d23799f25f..0000000000 --- a/lib/win32/Effects11/Effects11_Windows81.sln +++ /dev/null @@ -1,34 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11_Windows81", "Effects11_Windows81.vcxproj", "{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|ARM.ActiveCfg = Debug|ARM - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|ARM.Build.0 = Debug|ARM - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|Win32.ActiveCfg = Debug|Win32 - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|Win32.Build.0 = Debug|Win32 - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|x64.ActiveCfg = Debug|x64 - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|x64.Build.0 = Debug|x64 - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|ARM.ActiveCfg = Release|ARM - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|ARM.Build.0 = Release|ARM - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|Win32.ActiveCfg = Release|Win32 - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|Win32.Build.0 = Release|Win32 - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|x64.ActiveCfg = Release|x64 - {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib/win32/Effects11/Effects11_Windows81.vcxproj b/lib/win32/Effects11/Effects11_Windows81.vcxproj deleted file mode 100644 index bf23d712d8..0000000000 --- a/lib/win32/Effects11/Effects11_Windows81.vcxproj +++ /dev/null @@ -1,239 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Binary\EffectBinaryFormat.h" /> - <ClInclude Include="Binary\EffectStateBase11.h" /> - <ClInclude Include="Binary\EffectStates11.h" /> - <ClInclude Include="Binary\SOParser.h" /> - <ClInclude Include="Effect.h" /> - <ClInclude Include="EffectLoad.h" /> - <ClInclude Include="inc\d3dx11effect.h" /> - <ClInclude Include="inc\d3dxGlobal.h" /> - <ClInclude Include="IUnknownImp.h" /> - <ClInclude Include="pchfx.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="d3dxGlobal.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> - </ClCompile> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - </ItemGroup> - <ItemGroup> - <None Include="EffectVariable.inl" /> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{3218b7f0-abb8-47c3-8036-b61756e8acc3}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <ProjectName>Effects11_Windows81</ProjectName> - <RootNamespace>Effects11_Windows81</RootNamespace> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Store</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_Windows81.vcxproj.filters b/lib/win32/Effects11/Effects11_Windows81.vcxproj.filters deleted file mode 100644 index 9afb7a7d9c..0000000000 --- a/lib/win32/Effects11/Effects11_Windows81.vcxproj.filters +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="inc\d3dx11effect.h" /> - <ClInclude Include="inc\d3dxGlobal.h" /> - <ClInclude Include="Binary\EffectBinaryFormat.h" /> - <ClInclude Include="Binary\EffectStateBase11.h" /> - <ClInclude Include="Binary\EffectStates11.h" /> - <ClInclude Include="Binary\SOParser.h" /> - <ClInclude Include="Effect.h" /> - <ClInclude Include="EffectLoad.h" /> - <ClInclude Include="IUnknownImp.h" /> - <ClInclude Include="pchfx.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="d3dxGlobal.cpp" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - </ItemGroup> - <ItemGroup> - <None Include="EffectVariable.inl" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_WindowsPhone81.sln b/lib/win32/Effects11/Effects11_WindowsPhone81.sln deleted file mode 100644 index dfeae75e09..0000000000 --- a/lib/win32/Effects11/Effects11_WindowsPhone81.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11_WindowsPhone81", "Effects11_WindowsPhone81.vcxproj", "{961262DB-696C-48AF-BD8C-A080FC64C3F1}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|ARM.ActiveCfg = Debug|ARM - {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|ARM.Build.0 = Debug|ARM - {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|Win32.ActiveCfg = Debug|Win32 - {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|Win32.Build.0 = Debug|Win32 - {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|ARM.ActiveCfg = Release|ARM - {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|ARM.Build.0 = Release|ARM - {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|Win32.ActiveCfg = Release|Win32 - {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj b/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj deleted file mode 100644 index 898ae61976..0000000000 --- a/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj +++ /dev/null @@ -1,180 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Binary\EffectBinaryFormat.h" /> - <ClInclude Include="Binary\EffectStateBase11.h" /> - <ClInclude Include="Binary\EffectStates11.h" /> - <ClInclude Include="Binary\SOParser.h" /> - <ClInclude Include="Effect.h" /> - <ClInclude Include="EffectLoad.h" /> - <ClInclude Include="inc\d3dx11effect.h" /> - <ClInclude Include="inc\d3dxGlobal.h" /> - <ClInclude Include="IUnknownImp.h" /> - <ClInclude Include="pchfx.h" /> - </ItemGroup> - <ItemGroup> - <None Include="EffectVariable.inl" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="d3dxGlobal.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader> - </ClCompile> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{961262db-696c-48af-bd8c-a080fc64c3f1}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <ProjectName>Effects11</ProjectName> - <RootNamespace>Effects11</RootNamespace> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Phone</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir> - <TargetName>Effects11d</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj.filters b/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj.filters deleted file mode 100644 index 8eb5a2b883..0000000000 --- a/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="Effect.h" /> - <ClInclude Include="EffectLoad.h" /> - <ClInclude Include="IUnknownImp.h" /> - <ClInclude Include="pchfx.h" /> - <ClInclude Include="inc\d3dx11effect.h" /> - <ClInclude Include="inc\d3dxGlobal.h" /> - <ClInclude Include="Binary\EffectBinaryFormat.h" /> - <ClInclude Include="Binary\EffectStateBase11.h" /> - <ClInclude Include="Binary\EffectStates11.h" /> - <ClInclude Include="Binary\SOParser.h" /> - </ItemGroup> - <ItemGroup> - <None Include="EffectVariable.inl" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="d3dxGlobal.cpp" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_XboxOneXDK_2015.sln b/lib/win32/Effects11/Effects11_XboxOneXDK_2015.sln deleted file mode 100644 index 8890daa901..0000000000 --- a/lib/win32/Effects11/Effects11_XboxOneXDK_2015.sln +++ /dev/null @@ -1,23 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_XboxOneXDK_2015.vcxproj", "{A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Durango = Debug|Durango - Profile|Durango = Profile|Durango - Release|Durango = Release|Durango - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Debug|Durango.ActiveCfg = Debug|Durango - {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Debug|Durango.Build.0 = Debug|Durango - {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Profile|Durango.ActiveCfg = Profile|Durango - {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Profile|Durango.Build.0 = Profile|Durango - {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Release|Durango.ActiveCfg = Release|Durango - {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Release|Durango.Build.0 = Release|Durango - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj b/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj deleted file mode 100644 index bdff627c01..0000000000 --- a/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj +++ /dev/null @@ -1,197 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Release|Durango"> - <Configuration>Release</Configuration> - <Platform>Durango</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Profile|Durango"> - <Configuration>Profile</Configuration> - <Platform>Durango</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Durango"> - <Configuration>Debug</Configuration> - <Platform>Durango</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <RootNamespace>Effects11</RootNamespace> - <ProjectGuid>{a2d70d23-3516-40ec-b831-2fad3dafd8b7}</ProjectGuid> - <DefaultLanguage>en-US</DefaultLanguage> - <Keyword>Win32Proj</Keyword> - <ApplicationEnvironment>title</ApplicationEnvironment> - <ProjectName>Effects11</ProjectName> - <!-- - - - --> - <PlatformToolset>v110</PlatformToolset> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <TargetRuntime>Native</TargetRuntime> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v140</PlatformToolset> - <UseDebugLibraries>false</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <EmbedManifest>false</EmbedManifest> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v140</PlatformToolset> - <UseDebugLibraries>false</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <EmbedManifest>false</EmbedManifest> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v140</PlatformToolset> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <EmbedManifest>false</EmbedManifest> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'"> - <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath> - <LibraryPath>$(Console_SdkLibPath)</LibraryPath> - <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath> - <IncludePath>$(Console_SdkIncludeRoot)</IncludePath> - <ExecutablePath>$(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);</ExecutablePath> - <OutDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'"> - <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath> - <LibraryPath>$(Console_SdkLibPath)</LibraryPath> - <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath> - <IncludePath>$(Console_SdkIncludeRoot)</IncludePath> - <ExecutablePath>$(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);</ExecutablePath> - <OutDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'"> - <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath> - <LibraryPath>$(Console_SdkLibPath)</LibraryPath> - <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath> - <IncludePath>$(Console_SdkIncludeRoot)</IncludePath> - <ExecutablePath>$(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);</ExecutablePath> - <OutDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</OutDir> - <IntDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11d</TargetName> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'"> - <Link> - <AdditionalDependencies>d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib;</AdditionalDependencies> - <EntryPointSymbol> - </EntryPointSymbol> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalUsingDirectories>$(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> - <Optimization>MaxSpeed</Optimization> - <PreprocessorDefinitions>NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <WarningLevel>Level4</WarningLevel> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <CompileAsWinRT>false</CompileAsWinRT> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'"> - <Link> - <AdditionalDependencies>pixEvt.lib;d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib;</AdditionalDependencies> - <EntryPointSymbol> - </EntryPointSymbol> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <AdditionalUsingDirectories>$(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> - <Optimization>MaxSpeed</Optimization> - <PreprocessorDefinitions>NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <WarningLevel>Level4</WarningLevel> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <CompileAsWinRT>false</CompileAsWinRT> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'"> - <Link> - <AdditionalDependencies>d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib;</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> - <MinimalRebuild>false</MinimalRebuild> - <AdditionalUsingDirectories>$(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> - <WarningLevel>Level4</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <CompileAsWinRT>false</CompileAsWinRT> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="Binary\EffectBinaryFormat.h" /> - <ClInclude Include="Binary\EffectStateBase11.h" /> - <ClInclude Include="Binary\EffectStates11.h" /> - <ClInclude Include="Binary\SOParser.h" /> - <ClInclude Include="Effect.h" /> - <ClInclude Include="EffectLoad.h" /> - <ClInclude Include="inc\d3dx11effect.h" /> - <ClInclude Include="inc\d3dxGlobal.h" /> - <ClInclude Include="IUnknownImp.h" /> - <ClInclude Include="pchfx.h" /> - </ItemGroup> - <ItemGroup> - <None Include="EffectVariable.inl" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="d3dxGlobal.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'">Create</PrecompiledHeader> - </ClCompile> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj.filters b/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj.filters deleted file mode 100644 index 6a558f0b68..0000000000 --- a/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="Binary\EffectBinaryFormat.h" /> - <ClInclude Include="Binary\EffectStateBase11.h" /> - <ClInclude Include="Binary\EffectStates11.h" /> - <ClInclude Include="Binary\SOParser.h" /> - <ClInclude Include="inc\d3dx11effect.h" /> - <ClInclude Include="inc\d3dxGlobal.h" /> - <ClInclude Include="Effect.h" /> - <ClInclude Include="EffectLoad.h" /> - <ClInclude Include="IUnknownImp.h" /> - <ClInclude Include="pchfx.h" /> - </ItemGroup> - <ItemGroup> - <None Include="EffectVariable.inl" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="d3dxGlobal.cpp" /> - <ClCompile Include="EffectAPI.cpp" /> - <ClCompile Include="EffectLoad.cpp" /> - <ClCompile Include="EffectNonRuntime.cpp" /> - <ClCompile Include="EffectReflection.cpp" /> - <ClCompile Include="EffectRuntime.cpp" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/IUnknownImp.h b/lib/win32/Effects11/IUnknownImp.h index e8479a59ff..a08b7b6de2 100644 --- a/lib/win32/Effects11/IUnknownImp.h +++ b/lib/win32/Effects11/IUnknownImp.h @@ -6,12 +6,8 @@ // Lifetime for most Effects objects is based on the the lifetime of the master // effect, so the reference count is not used. // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -20,7 +16,7 @@ #define IUNKNOWN_IMP(Class, Interface, BaseInterface) \ \ -HRESULT STDMETHODCALLTYPE Class##::QueryInterface(REFIID iid, _COM_Outptr_ LPVOID *ppv) override \ +HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, _COM_Outptr_ LPVOID *ppv) override \ { \ if( !ppv ) \ return E_INVALIDARG; \ @@ -46,12 +42,12 @@ HRESULT STDMETHODCALLTYPE Class##::QueryInterface(REFIID iid, _COM_Outptr_ LPVOI return S_OK; \ } \ \ -ULONG STDMETHODCALLTYPE Class##::AddRef() override \ +ULONG STDMETHODCALLTYPE AddRef() override \ { \ return 1; \ } \ \ -ULONG STDMETHODCALLTYPE Class##::Release() override \ +ULONG STDMETHODCALLTYPE Release() override \ { \ return 0; \ } diff --git a/lib/win32/Effects11/MIT.txt b/lib/win32/Effects11/LICENSE index 1abfa2b096..61784d451a 100644 --- a/lib/win32/Effects11/MIT.txt +++ b/lib/win32/Effects11/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 Microsoft Corp +Copyright (c) 2009-2019 Microsoft Corp Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/lib/win32/Effects11/Microsoft Public License.rtf b/lib/win32/Effects11/Microsoft Public License.rtf deleted file mode 100644 index 390c7adbba..0000000000 --- a/lib/win32/Effects11/Microsoft Public License.rtf +++ /dev/null @@ -1,234 +0,0 @@ -{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;} -{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f36\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;} -{\f39\fbidi \fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Verdana;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;} -{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;} -{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f40\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f41\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\f43\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f44\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f45\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f46\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\f47\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f48\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f50\fbidi \fswiss\fcharset238\fprq2 Arial CE;}{\f51\fbidi \fswiss\fcharset204\fprq2 Arial Cyr;} -{\f53\fbidi \fswiss\fcharset161\fprq2 Arial Greek;}{\f54\fbidi \fswiss\fcharset162\fprq2 Arial Tur;}{\f55\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f56\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);} -{\f57\fbidi \fswiss\fcharset186\fprq2 Arial Baltic;}{\f58\fbidi \fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f380\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f381\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} -{\f383\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f384\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f387\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f388\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);} -{\f400\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\f401\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\f403\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\f404\fbidi \froman\fcharset162\fprq2 Cambria Tur;} -{\f407\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\f408\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\f420\fbidi \fswiss\fcharset238\fprq2 Tahoma CE;}{\f421\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;} -{\f423\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek;}{\f424\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}{\f425\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f426\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);} -{\f427\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f428\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f429\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f430\fbidi \fswiss\fcharset238\fprq2 Verdana CE;} -{\f431\fbidi \fswiss\fcharset204\fprq2 Verdana Cyr;}{\f433\fbidi \fswiss\fcharset161\fprq2 Verdana Greek;}{\f434\fbidi \fswiss\fcharset162\fprq2 Verdana Tur;}{\f437\fbidi \fswiss\fcharset186\fprq2 Verdana Baltic;} -{\f438\fbidi \fswiss\fcharset163\fprq2 Verdana (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;} -{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;} -{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} -{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} -{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;} -{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} -{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} -{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} -{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0; -\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp }{\*\defpap -\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 -\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\s1\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel0\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 -\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink15 \sqformat \spriority9 heading 1;}{\s2\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel1\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 -\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink16 \sqformat \spriority9 heading 2;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\* -\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv -\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused Normal Table;}{\*\cs15 \additive -\rtlch\fcs1 \ab\af0\afs32 \ltrch\fcs0 \b\f36\fs32\kerning32 \sbasedon10 \slink1 \slocked \spriority9 Heading 1 Char;}{\*\cs16 \additive \rtlch\fcs1 \ab\ai\af0\afs28 \ltrch\fcs0 \b\i\f36\fs28 \sbasedon10 \slink2 \slocked \spriority9 Heading 2 Char;}{ -\s17\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs16\alang1025 \ltrch\fcs0 \f38\fs16\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext17 \slink18 \ssemihidden \sunhideused \styrsid7424395 Balloon Text;} -{\*\cs18 \additive \rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16 \sbasedon10 \slink17 \slocked \ssemihidden \styrsid7424395 Balloon Text Char;}{\*\cs19 \additive \rtlch\fcs1 \af0\afs16 \ltrch\fcs0 \fs16 -\sbasedon10 \ssemihidden \sunhideused \styrsid4538388 annotation reference;}{\s20\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 -\sbasedon0 \snext20 \slink21 \ssemihidden \sunhideused \styrsid4538388 annotation text;}{\*\cs21 \additive \rtlch\fcs1 \af1 \ltrch\fcs0 \f1 \sbasedon10 \slink20 \slocked \ssemihidden \styrsid4538388 Comment Text Char;}{ -\s22\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \ab\af1\afs20\alang1025 \ltrch\fcs0 \b\f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon20 \snext20 \slink23 \ssemihidden \sunhideused \styrsid4538388 -annotation subject;}{\*\cs23 \additive \rtlch\fcs1 \ab\af1 \ltrch\fcs0 \b\f1 \sbasedon21 \slink22 \slocked \ssemihidden \styrsid4538388 Comment Subject Char;}}{\*\rsidtbl \rsid213160\rsid284417\rsid417145\rsid481196\rsid551334\rsid723397\rsid786968 -\rsid1382437\rsid1390003\rsid1521043\rsid1530955\rsid1708989\rsid1783212\rsid1903779\rsid2431884\rsid3165084\rsid3416120\rsid3419781\rsid3754103\rsid3768194\rsid3831520\rsid4538130\rsid4538388\rsid4552277\rsid4680449\rsid4729674\rsid4865270\rsid4987534 -\rsid5128131\rsid5186068\rsid5601121\rsid5864350\rsid6186044\rsid6311778\rsid6384507\rsid6434687\rsid6561471\rsid6910344\rsid6947552\rsid7033180\rsid7424395\rsid7682010\rsid7690850\rsid7744081\rsid8151618\rsid8196281\rsid8198206\rsid8342723\rsid8350925 -\rsid8722561\rsid8852349\rsid8934457\rsid8944153\rsid9573035\rsid9635349\rsid9638545\rsid9724918\rsid10044820\rsid10095979\rsid10228618\rsid10449644\rsid10494075\rsid11166278\rsid11166751\rsid11285353\rsid11366513\rsid11494815\rsid11932529\rsid12061202 -\rsid12533699\rsid12536400\rsid12916885\rsid13264736\rsid13322831\rsid13440556\rsid13455614\rsid13597357\rsid13768671\rsid14097590\rsid14157399\rsid14229900\rsid14305025\rsid14314735\rsid14436896\rsid14565916\rsid14572556\rsid14688892\rsid14752433 -\rsid14904394\rsid15086147\rsid15749945\rsid15814398\rsid15927751\rsid16071312\rsid16126175\rsid16279402\rsid16391569\rsid16404661\rsid16452939\rsid16537688\rsid16606866\rsid16674896}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1 -\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\title Microsoft Permissive License (Ms-PL)}{\author Jonr}{\operator Chuck Walbourn}{\creatim\yr2007\mo2\dy23\hr15\min10}{\revtim\yr2011\mo8\dy15\hr15\min2} -{\printim\yr2006\mo9\dy28\hr8\min46}{\version3}{\edmins1}{\nofpages1}{\nofwords391}{\nofchars2230}{\*\company Microsoft}{\nofcharsws2616}{\vern49273}}{\*\userprops {\propname _NewReviewCycle}\proptype30{\staticval }}{\*\xmlnstbl {\xmlns1 http://schemas.mi -crosoft.com/office/word/2003/wordml}{\xmlns2 urn:schemas-microsoft-com:office:smarttags}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect -\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\hyphcaps0\horzdoc\dghspace120\dgvspace120 -\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\splytwnine\ftnlytwnine\htmautsp\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct\asianbrkrule\rsidroot10494075 -\newtblstyruls\nogrowautofit\utinl \fet0{\*\wgrffmtfilter 2450}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}} -{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (} -{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar -\s1\ql \li0\ri0\sb180\nowidctlpar\wrapdefault\faauto\outlinelevel0\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 -\fs31\cf1\kerning36\insrsid10494075\charrsid14688892 Microsoft}{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 \fs31\cf1\kerning36\insrsid10494075 }{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 \fs31\cf1\kerning36\insrsid5601121 Public}{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 -\fs31\cf1\kerning36\insrsid14688892 }{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 \fs31\cf1\kerning36\insrsid10494075 License (Ms-PL}{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 \fs31\cf1\kerning36\insrsid4552277 )}{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 -\fs31\cf1\kerning36\insrsid10494075 -\par }\pard\plain \ltrpar\ql \li0\ri0\sl336\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab\af39\afs17 \ltrch\fcs0 -\b\f39\fs17\insrsid10494075 -\par This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software. -\par }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6910344 -\par }\pard\plain \ltrpar\s2\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel1\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab\af39\afs23 \ltrch\fcs0 -\b\f39\fs23\insrsid10494075 1. Definitions -\par }\pard\plain \ltrpar\ql \li0\ri0\sl336\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid10494075 The terms \'93reproduce,\'94 \'93reproduction}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7744081 ,}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 \'94 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid551334 \'93derivative works,\'94}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7744081\charrsid7744081 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 and \'93distribution\'94 have the same meaning here as under -{\*\xmlopen\xmlns2{\factoidname place}}{\*\xmlopen\xmlns2{\factoidname country-region}}U.S.{\*\xmlclose}{\*\xmlclose} copyright law. -\par }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 A \'93contribution\'94 is the original software}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid4865270 ,}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 }{\rtlch\fcs1 -\af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid11932529 or}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 any additions or changes to the software. -\par }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid551334 A \'93c}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid551334\charrsid551334 ontributor\'94 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 is}{\rtlch\fcs1 \af39\afs17 -\ltrch\fcs0 \f39\fs17\insrsid12536400\charrsid551334 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid551334\charrsid551334 any person that }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 -distributes its contribution under this license.}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 -\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid14229900 {\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid4729674\delrsid4729674 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 \'93Licensed patents -\'94 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 are }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3831520 a contributor\rquote s }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 patent claims }{\rtlch\fcs1 -\af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3831520 that }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 read directly on }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3831520 its contribution.}{\rtlch\fcs1 \af1 \ltrch\fcs0 -\insrsid14229900\charrsid14229900 -\par }\pard\plain \ltrpar\s2\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel1\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab\af39\afs23 \ltrch\fcs0 -\b\f39\fs23\insrsid5186068 -\par }{\rtlch\fcs1 \ab\af39\afs23 \ltrch\fcs0 \b\f39\fs23\insrsid10494075 2. Grant of Rights -\par }\pard\plain \ltrpar\ql \li0\ri0\sl336\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid10494075 (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3754103 each contributor }{\rtlch\fcs1 \af39\afs17 -\ltrch\fcs0 \f39\fs17\insrsid10494075 grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3754103 its contribution}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid10494075 , prepare derivative works of }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3754103 its contribution}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 ,}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid10494075 and distribute }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3754103 its contribution}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 or any derivative works that you create. -\par (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid9724918 each contributor }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid10494075 grants you a non-exclusive, worldwide, royalty-free license under }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid15814398 its }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 -licensed patents to make, have made, use, sell, offer for sale, }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid1390003 import, }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 and/or otherwise dispose of }{\rtlch\fcs1 \af39\afs17 -\ltrch\fcs0 \f39\fs17\insrsid8944153 its contribution in }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 the software or derivative works of }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid8944153 the contribution in }{\rtlch\fcs1 -\af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 the software. -\par }\pard\plain \ltrpar\s2\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel1\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab\af39\afs23 \ltrch\fcs0 -\b\f39\fs23\insrsid5186068 -\par }{\rtlch\fcs1 \ab\af39\afs23 \ltrch\fcs0 \b\f39\fs23\insrsid10494075 3. Conditions and Limitations -\par }\pard\plain \ltrpar\ql \li0\ri0\sl336\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid1530955 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 (A) No Trademark License- This license does not grant you rights to use }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid1708989 any contributors\rquote }{ -\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 name, logo, or trademarks. -\par (B) If you }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid8934457 bring a patent claim against }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10095979 any contributor}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 - over patents that you }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6947552 claim }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7682010 are }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6947552 infringe}{\rtlch\fcs1 -\af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7682010 d by}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 the software, your }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7682010 patent }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid10494075 license}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7682010 from such contributor}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 to the software ends automatically. -\par (C) If you distribute }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3165084 any portion of }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 -the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. -\par (D) If you distribute }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid15749945 any portion of the }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 software in source code form}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid14904394 ,}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 you may do so only under this license}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6384507 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid14904394 by including }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 a complete copy of this license with your distribution}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6384507 .}{\rtlch\fcs1 \af39\afs17 -\ltrch\fcs0 \f39\fs17\insrsid10494075 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6384507 I}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 f you distribute }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid15749945 -any portion of }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 the software in compiled or object code form}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid16452939 ,}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 - you may only do so under a license that complies with this license. -\par }\pard \ltrpar\ql \li0\ri0\sl336\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid14572556 {\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 (E) The software is licensed \'93as-is.\'94 You bear the risk of using it. }{ -\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid284417 The contributors }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 -give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid1783212 the contributors }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 -\f39\fs17\insrsid10494075\charrsid14572556 -\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a -9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad -5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 -b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 -0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 -a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f -c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 -0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 -a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 -6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b -4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b -4757e8d3f729e245eb2b260a0238fd010000ffff0300504b03041400060008000000210096b5ade296060000501b0000160000007468656d652f7468656d652f -7468656d65312e786d6cec594f6fdb3614bf0fd87720746f6327761a07758ad8b19b2d4d1bc46e871e698996d850a240d2497d1bdae38001c3ba618715d86d87 -615b8116d8a5fb34d93a6c1dd0afb0475292c5585e9236d88aad3e2412f9e3fbff1e1fa9abd7eec70c1d1221294fda5efd72cd4324f1794093b0eddd1ef62fad -79482a9c0498f184b4bd2991deb58df7dfbb8ad755446282607d22d771db8b944ad79796a40fc3585ee62949606ecc458c15bc8a702910f808e8c66c69b9565b -5d8a314d3c94e018c8de1a8fa94fd05093f43672e23d06af89927ac06762a049136785c10607758d9053d965021d62d6f6804fc08f86e4bef210c352c144dbab -999fb7b4717509af678b985ab0b6b4ae6f7ed9ba6c4170b06c788a705430adf71bad2b5b057d03606a1ed7ebf5babd7a41cf00b0ef83a6569632cd467faddec9 -699640f6719e76b7d6ac355c7c89feca9cccad4ea7d36c65b258a206641f1b73f8b5da6a6373d9c11b90c537e7f08dce66b7bbeae00dc8e257e7f0fd2badd586 -8b37a088d1e4600ead1ddaef67d40bc898b3ed4af81ac0d76a197c86826828a24bb318f3442d8ab518dfe3a20f000d6458d104a9694ac6d88728eee2782428d6 -0cf03ac1a5193be4cbb921cd0b495fd054b5bd0f530c1931a3f7eaf9f7af9e3f45c70f9e1d3ff8e9f8e1c3e3073f5a42ceaa6d9c84e5552fbffdeccfc71fa33f -9e7ef3f2d117d57859c6fffac327bffcfc793510d26726ce8b2f9ffcf6ecc98baf3efdfdbb4715f04d814765f890c644a29be408edf3181433567125272371be -15c308d3f28acd249438c19a4b05fd9e8a1cf4cd296699771c393ac4b5e01d01e5a30a787d72cf1178108989a2159c77a2d801ee72ce3a5c545a6147f32a9979 -3849c26ae66252c6ed637c58c5bb8b13c7bfbd490a75330f4b47f16e441c31f7184e140e494214d273fc80900aedee52ead87597fa824b3e56e82e451d4c2b4d -32a423279a668bb6690c7e9956e90cfe766cb37b077538abd27a8b1cba48c80acc2a841f12e698f13a9e281c57911ce298950d7e03aba84ac8c154f8655c4f2a -f074481847bd804859b5e696007d4b4edfc150b12addbecba6b18b148a1e54d1bc81392f23b7f84137c2715a851dd0242a633f900710a218ed715505dfe56e86 -e877f0034e16bafb0e258ebb4faf06b769e888340b103d3311da9750aa9d0a1cd3e4efca31a3508f6d0c5c5c398602f8e2ebc71591f5b616e24dd893aa3261fb -44f95d843b5974bb5c04f4edafb95b7892ec1108f3f98de75dc97d5772bdff7cc95d94cf672db4b3da0a6557f70db629362d72bcb0431e53c6066acac80d699a -6409fb44d08741bdce9c0e4971624a2378cceaba830b05366b90e0ea23aaa241845368b0eb9e2612ca8c742851ca251ceccc70256d8d87265dd96361531f186c -3d9058edf2c00eafe8e1fc5c509031bb4d680e9f39a3154de0accc56ae644441edd76156d7429d995bdd88664a9dc3ad50197c38af1a0c16d684060441db0256 -5e85f3b9660d0713cc48a0ed6ef7dedc2dc60b17e92219e180643ed27acffba86e9c94c78ab90980d8a9f0913ee49d62b512b79626fb06dccee2a432bbc60276 -b9f7dec44b7904cfbca4f3f6443ab2a49c9c2c41476dafd55c6e7ac8c769db1bc399161ee314bc2e75cf8759081743be1236ec4f4d6693e5336fb672c5dc24a8 -c33585b5fb9cc24e1d4885545b58463634cc5416022cd19cacfccb4d30eb45296023fd35a458598360f8d7a4003bbaae25e331f155d9d9a5116d3bfb9a95523e -51440ca2e0088dd844ec6370bf0e55d027a012ae264c45d02f708fa6ad6da6dce29c255df9f6cae0ec38666984b372ab5334cf640b37795cc860de4ae2816e95 -b21be5ceaf8a49f90b52a51cc6ff3355f47e0237052b81f6800fd7b802239daf6d8f0b1571a8426944fdbe80c6c1d40e8816b88b8569082ab84c36ff0539d4ff -6dce591a26ade1c0a7f669880485fd484582903d284b26fa4e2156cff62e4b9265844c4495c495a9157b440e091bea1ab8aaf7760f4510eaa69a6465c0e04ec6 -9ffb9e65d028d44d4e39df9c1a52ecbd3607fee9cec7263328e5d661d3d0e4f62f44acd855ed7ab33cdf7bcb8ae889599bd5c8b3029895b6825696f6af29c239 -b75a5bb1e6345e6ee6c28117e73586c1a2214ae1be07e93fb0ff51e133fb65426fa843be0fb515c187064d0cc206a2fa926d3c902e907670048d931db4c1a449 -59d366ad93b65abe595f70a75bf03d616c2dd959fc7d4e6317cd99cbcec9c58b34766661c7d6766ca1a9c1b327531486c6f941c638c67cd22a7f75e2a37be0e8 -2db8df9f30254d30c1372581a1f51c983c80e4b71ccdd28dbf000000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468 -656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4 -350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d2624 -52282e3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe5141 -73d9850528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000 -0000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000 -000000000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019 -0200007468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d001400060008000000210096b5ade296060000501b00001600000000 -000000000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027 -00000000000000000000000000a00900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d0100009b0a00000000} -{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d -617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 -6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 -656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} -{\*\latentstyles\lsdstimax267\lsdlockeddef0\lsdsemihiddendef1\lsdunhideuseddef1\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3; -\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8; -\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 1;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 2;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 3;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 4; -\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 5;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 6;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 7;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 8;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 9; -\lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdpriority59 \lsdlocked0 Table Grid; -\lsdunhideused0 \lsdlocked0 Placeholder Text;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdunhideused0 \lsdlocked0 Revision;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdpriority37 \lsdlocked0 Bibliography; -\lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;}}{\*\datastore 0105000002000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 -d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000808a -33fc965bcc01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000105000000000000}}
\ No newline at end of file diff --git a/lib/win32/Effects11/ReadMe.txt b/lib/win32/Effects11/ReadMe.txt index 9e32f234b0..1b87e37888 100644 --- a/lib/win32/Effects11/ReadMe.txt +++ b/lib/win32/Effects11/ReadMe.txt @@ -3,16 +3,19 @@ EFFECTS FOR DIRECT3D 11 (FX11) Copyright (c) Microsoft Corporation. All rights reserved. -August 1, 2016 +April 26, 2019 Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together. -The source is written for Visual Studio 2013 or 2015. It is recommended that you -make use of VS 2013 Update 5, VS 2015 Update 2, and Windows 7 Service Pack 1 or later. +This code is designed to build with Visual Studio 2015 Update 3, Visual Studio 2017, +or Visual Studio 2019. It is recommended that you make use of VS 2015 Update 3, +Windows Tools 1.4.1, and the Windows 10 Anniversary Update SDK (14393) -or- +VS 2017 (15.9 update) / VS 2019 with the Windows 10 October 2018 Update SDK (17763). -These components are designed to work without requiring any content from the DirectX SDK. For details, -see "Where is the DirectX SDK?" <http://msdn.microsoft.com/en-us/library/ee663275.aspx>. +These components are designed to work without requiring any content from the +legacy DirectX SDK. For details, see "Where is the DirectX SDK?" +<https://aka.ms/dxsdk>. All content and source code for this package are subject to the terms of the MIT License. <http://opensource.org/licenses/MIT>. @@ -60,6 +63,38 @@ in a future update. RELEASE HISTORY --------------- +April 26, 2019 (11.26) + Added VS 2019 desktop projects + VS 2017 updated for Windows 10 October 2018 Update SDK (17763) + Minor code cleanup + +July 12, 2018 (11.25) + Added D3DX11DebugMute function + Minor project and code cleanup + +May 31, 2018 (11.24) + VS 2017 updated for Windows 10 April 2018 Update SDK (17134) + +May 11, 2018 (11.23) + Retired VS 2013 projects + Code cleanup + +February 27, 2018 (11.22) + Minor code update + +November 2, 2017 (11.21) + VS 2017 updated for Windows 10 Fall Creators Update SDK (16299) + +October 13, 2017 (11.20) + Updated for VS 2017 update 15.1 - 15.3 and Windows 10 SDK (15063) + +March 10, 2017 (11.19) + Add VS 2017 projects + Minor code cleanup + +September 15, 2016 (11.18) + Minor code cleanup + August 2, 2016 (11.17) Updated for VS 2015 Update 3 and Windows 10 SDK (14393) Added 'D' suffix to debug libraries per request diff --git a/lib/win32/Effects11/Windows81SDKVS12_x64.props b/lib/win32/Effects11/Windows81SDKVS12_x64.props deleted file mode 100644 index e7d823b9ef..0000000000 --- a/lib/win32/Effects11/Windows81SDKVS12_x64.props +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets" /> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <ExecutablePath>$(ProgramFiles)\Windows Kits\8.1\bin\x64;$(ExecutablePath)</ExecutablePath> - <IncludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(IncludePath)</IncludePath> - <LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\winv6.3\um\x64;$(LibraryPath)</LibraryPath> - <ExcludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(ExcludePath)</ExcludePath> - </PropertyGroup> -<ItemDefinitionGroup /> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Windows81SDKVS12_x86.props b/lib/win32/Effects11/Windows81SDKVS12_x86.props deleted file mode 100644 index c5c64ce01d..0000000000 --- a/lib/win32/Effects11/Windows81SDKVS12_x86.props +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets" /> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <ExecutablePath>$(ProgramFiles)\Windows Kits\8.1\bin\x86;$(ExecutablePath)</ExecutablePath> - <IncludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(IncludePath)</IncludePath> - <LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\winv6.3\um\x86;$(LibraryPath)</LibraryPath> - <ExcludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(ExcludePath)</ExcludePath> - </PropertyGroup> -<ItemDefinitionGroup /> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Windows81SDK_x64.props b/lib/win32/Effects11/Windows81SDK_x64.props deleted file mode 100644 index 77f78c6476..0000000000 --- a/lib/win32/Effects11/Windows81SDK_x64.props +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets" /> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <ExecutablePath>$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(ProgramFiles)\Windows Kits\8.1\bin\x86;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH)</ExecutablePath> - <IncludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(FrameworkSDKDir)\include;</IncludePath> - <LibraryPath>$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(ProgramFiles)\Windows Kits\8.1\lib\winv6.3\um\x64;$(FrameworkSDKDir)\lib\x64</LibraryPath> - <ExcludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(FrameworkSDKDir)\include;$(MSBuildToolsPath32);$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;</ExcludePath> - </PropertyGroup> -<ItemDefinitionGroup /> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Windows81SDK_x86.props b/lib/win32/Effects11/Windows81SDK_x86.props deleted file mode 100644 index eac3fa1350..0000000000 --- a/lib/win32/Effects11/Windows81SDK_x86.props +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets" /> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(ProgramFiles)\Windows Kits\8.1\bin\x86;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH)</ExecutablePath> - <IncludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(FrameworkSDKDir)\include;</IncludePath> - <LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(ProgramFiles)\Windows Kits\8.1\lib\winv6.3\um\x86;$(FrameworkSDKDir)\lib</LibraryPath> - <ExcludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(FrameworkSDKDir)\include;$(MSBuildToolsPath32);$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;</ExcludePath> - </PropertyGroup> -<ItemDefinitionGroup /> -</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/d3dxGlobal.cpp b/lib/win32/Effects11/d3dxGlobal.cpp index af786c81b4..3cca34fdc8 100644 --- a/lib/win32/Effects11/d3dxGlobal.cpp +++ b/lib/win32/Effects11/d3dxGlobal.cpp @@ -3,12 +3,8 @@ // // Direct3D 11 Effects implementation for helper data structures // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -27,7 +23,10 @@ namespace D3DX11Core // CMemoryStream - A class to simplify reading binary data ////////////////////////////////////////////////////////////////////////// -CMemoryStream::CMemoryStream() : m_pData(nullptr), m_cbData(0), m_readPtr(0) +CMemoryStream::CMemoryStream() noexcept : + m_pData(nullptr), + m_cbData(0), + m_readPtr(0) { } @@ -128,7 +127,7 @@ HRESULT CMemoryStream::Seek(_In_ size_t offset) // CDataBlock - used to dynamically build up the effect file in memory ////////////////////////////////////////////////////////////////////////// -CDataBlock::CDataBlock() : +CDataBlock::CDataBlock() noexcept : m_size(0), m_maxSize(0), m_pData(nullptr), @@ -255,7 +254,7 @@ void* CDataBlock::Allocate(uint32_t bufferSize, CDataBlock **ppBlock) ////////////////////////////////////////////////////////////////////////// -CDataBlockStore::CDataBlockStore() : +CDataBlockStore::CDataBlockStore() noexcept : m_pFirst(nullptr), m_pLast(nullptr), m_Size(0), @@ -368,14 +367,26 @@ uint32_t CDataBlockStore::GetSize() ////////////////////////////////////////////////////////////////////////// +static bool s_mute = false; + +bool D3DX11DebugMute(bool mute) +{ + bool previous = s_mute; + s_mute = mute; + return previous; +} + #ifdef _DEBUG _Use_decl_annotations_ void __cdecl D3DXDebugPrintf(UINT lvl, LPCSTR szFormat, ...) { + if (s_mute) + return; + UNREFERENCED_PARAMETER(lvl); - char strA[4096]; - char strB[4096]; + char strA[4096] = {}; + char strB[4096] = {}; va_list ap; va_start(ap, szFormat); diff --git a/lib/win32/Effects11/inc/d3dx11effect.h b/lib/win32/Effects11/inc/d3dx11effect.h index f9adcea3d6..d2663aca99 100644 --- a/lib/win32/Effects11/inc/d3dx11effect.h +++ b/lib/win32/Effects11/inc/d3dx11effect.h @@ -3,23 +3,18 @@ // // Direct3D 11 Effect Types & APIs Header // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- #pragma once -#define D3DX11_EFFECTS_VERSION 1117 +#define D3DX11_EFFECTS_VERSION 1126 #if defined(_XBOX_ONE) && defined(_TITLE) #include <d3d11_x.h> -#define DCOMMON_H_INCLUDED #define NO_D3D11_DEBUG_NAME #else #include <d3d11_1.h> @@ -1195,6 +1190,23 @@ HRESULT D3DX11CompileEffectFromFile( _In_z_ LPCWSTR pFileName, _Out_ ID3DX11Effect **ppEffect, _Outptr_opt_result_maybenull_ ID3DBlob **ppErrors ); + +//---------------------------------------------------------------------------- +// D3DX11DebugMute +// +// Controls the output of diagnostic information in DEBUG builds. No effect +// in RELEASE builds. +// +// Returns the previous state so you can do temporary suppression like: +// +// bool oldmute = D3DX11DebugMute(true); +// ... +// D3DX11DebugMute(oldmute); +// +//---------------------------------------------------------------------------- + +bool D3DX11DebugMute(bool mute); + #ifdef __cplusplus } #endif //__cplusplus diff --git a/lib/win32/Effects11/inc/d3dxGlobal.h b/lib/win32/Effects11/inc/d3dxGlobal.h index bdd738c311..688b003773 100644 --- a/lib/win32/Effects11/inc/d3dxGlobal.h +++ b/lib/win32/Effects11/inc/d3dxGlobal.h @@ -3,12 +3,8 @@ // // Direct3D 11 Effects helper defines and data structures // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -118,13 +114,13 @@ public: size_t GetPosition(); HRESULT Seek(_In_ size_t offset); - CMemoryStream(); + CMemoryStream() noexcept; ~CMemoryStream(); }; } -#if defined(_DEBUG) && !defined(_M_X64) +#if defined(_DEBUG) && !defined(_M_X64) && !defined(_M_ARM64) namespace D3DX11Debug { @@ -200,7 +196,11 @@ protected: public: HRESULT m_hLastError; - CEffectVector<T>() : m_hLastError(S_OK), m_pData(nullptr), m_CurSize(0), m_MaxSize(0) + CEffectVector<T>() noexcept : + m_hLastError(S_OK), + m_pData(nullptr), + m_CurSize(0), + m_MaxSize(0) { #if _DEBUG m_pCastData = nullptr; @@ -477,7 +477,9 @@ template <class T, T MaxValue> class CheckedNumber bool m_bValid; public: - CheckedNumber<T, MaxValue>() : m_Value(0), m_bValid(true) + CheckedNumber<T, MaxValue>() noexcept : + m_Value(0), + m_bValid(true) { } @@ -580,7 +582,7 @@ public: void EnableAlignment(); - CDataBlock(); + CDataBlock() noexcept; ~CDataBlock(); friend class CDataBlockStore; @@ -613,7 +615,7 @@ public: uint32_t GetSize(); void EnableAlignment(); - CDataBlockStore(); + CDataBlockStore() noexcept; ~CDataBlockStore(); }; @@ -838,7 +840,11 @@ public: } }; - CEffectHashTable() : m_rgpHashEntries(nullptr), m_NumHashSlots(0), m_NumEntries(0), m_bOwnHashEntryArray(false) + CEffectHashTable() noexcept : + m_rgpHashEntries(nullptr), + m_NumHashSlots(0), + m_NumEntries(0), + m_bOwnHashEntryArray(false) { } @@ -1234,9 +1240,9 @@ protected: CDataBlockStore *m_pPrivateHeap; public: - CEffectHashTableWithPrivateHeap() + CEffectHashTableWithPrivateHeap() noexcept : + m_pPrivateHeap(nullptr) { - m_pPrivateHeap = nullptr; } void Cleanup() diff --git a/lib/win32/Effects11/pchfx.h b/lib/win32/Effects11/pchfx.h index dbdabb1f82..1991014b73 100644 --- a/lib/win32/Effects11/pchfx.h +++ b/lib/win32/Effects11/pchfx.h @@ -3,12 +3,8 @@ // // Direct3D 11 shader effects precompiled header // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- |