diff --git a/src/Common.props b/src/Common.props index 67c1a1fc832..33619a9a976 100644 --- a/src/Common.props +++ b/src/Common.props @@ -3,40 +3,28 @@ $(SolutionDir)..\bin\ - $(SolutionDir)..\bin_plugs\ $(SolutionDir)..\lib\ $(SolutionDir)..\bin\$(Configuration)\ - $(SolutionDir)..\bin_plugs\$(Configuration)\ + $(SolutionDir)..\bin\$(Configuration)\plugins\ $(SolutionDir)..\lib\$(Configuration)\ $(SolutionDir)..\intermediate\$(Configuration)\ $(SolutionDir)..\sdk\ - - - - - $(xrBinRootDir) - - - $(xrBinPlugRootDir) - - - $(xrLibRootDir) - - - $(xrBinDir) - - - $(xrBinPlugDir) - - - $(xrLibDir) - - - $(xrIntDir) - - - $(xrSdkDir) - - + + $(xrBinDir) + $(xrIntDir)$(ProjectName) + + + + $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) + + + $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) + $(xrLibDir)$(TargetName).lib + + + $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) + $(xrLibDir)$(TargetName).lib + + \ No newline at end of file diff --git a/src/Externals/NVTT/NVTT.vcxproj b/src/Externals/NVTT/NVTT.vcxproj index 2eb27e502fb..34d3610e792 100644 --- a/src/Externals/NVTT/NVTT.vcxproj +++ b/src/Externals/NVTT/NVTT.vcxproj @@ -160,6 +160,7 @@ {0EB257DC-5CFC-44B0-82C9-CE6B158BE473} nvtt + 8.1 @@ -206,14 +207,8 @@ - - $(xrLibDir) - $(xrIntDir)$(ProjectName)\ - - - $(xrLibDir) - $(xrIntDir)$(ProjectName)\ - + + Level3 diff --git a/src/Externals/cximage/cximage.vcxproj b/src/Externals/cximage/cximage.vcxproj index 443b9dd9f87..ddc9975091a 100644 --- a/src/Externals/cximage/cximage.vcxproj +++ b/src/Externals/cximage/cximage.vcxproj @@ -14,22 +14,19 @@ CxImage {880CD250-BA77-4DAF-A8D4-552F12DD3AE4} MFCProj + 8.1 DynamicLibrary v140 - false MultiByte - false false StaticLibrary v140 - false MultiByte - false true @@ -50,13 +47,9 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrLibDir) - $(xrIntDir)$(ProjectName)\ $(ProjectName)_static - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -67,7 +60,7 @@ Speed true true - $(SolutionDir)Externals;$(SolutionDir);%(AdditionalIncludeDirectories) + $(SolutionDir)Externals;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;JAS_WIN_MSVC_BUILD;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;CXIMAGE_BUILD;%(PreprocessorDefinitions) true false @@ -88,20 +81,15 @@ /ignore:4075 %(AdditionalOptions) - $(OutDir)$(ProjectName).lib - $(SolutionDir)Externals\jpeg\libraries\Release;$(xrLibDir);%(AdditionalLibraryDirectories) - true + $(SolutionDir)Externals\jpeg\libraries\Release;%(AdditionalLibraryDirectories) true - - true - .\Release/cximage.bsc - + Disabled - $(SolutionDir)Externals;$(SolutionDir);%(AdditionalIncludeDirectories) + $(SolutionDir)Externals;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_AS_SHARED_LIBRARY;_USRDLL;CXIMAGE_BUILD;%(PreprocessorDefinitions) false Sync @@ -119,18 +107,11 @@ 0x0809 - $(OutDir)$(TargetName)$(TargetExt) - $(SolutionDir)Externals\jpeg\libraries\Release;$(xrLibDir);%(AdditionalLibraryDirectories) - $(OutDir)$(TargetName).pdb - $(xrLibDir)$(TargetName).lib - true + $(SolutionDir)Externals\jpeg\libraries\Release;%(AdditionalLibraryDirectories) - - true - Debug/cximage.bsc - + diff --git a/src/Externals/luabind b/src/Externals/luabind index 608a0de535e..85ccc3b7f85 160000 --- a/src/Externals/luabind +++ b/src/Externals/luabind @@ -1 +1 @@ -Subproject commit 608a0de535e031e223a83baa1345f4ad35bef85d +Subproject commit 85ccc3b7f85798339e56cfd15845345a79911b79 diff --git a/src/Externals/ode/contrib/msvc7/ode_default/default.vcxproj b/src/Externals/ode/contrib/msvc7/ode_default/default.vcxproj index 83a977609f4..f1e89abe510 100644 --- a/src/Externals/ode/contrib/msvc7/ode_default/default.vcxproj +++ b/src/Externals/ode/contrib/msvc7/ode_default/default.vcxproj @@ -18,6 +18,7 @@ ode {1BF75FEB-87DD-486C-880B-227987D191C2} AtlProj + 8.1 @@ -63,22 +64,16 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true false false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true false false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true false false @@ -117,11 +112,9 @@ ../../../config/msvcdefs.def - true Windows true false - $(xrLibDir)$(TargetName).lib MachineX86 @@ -170,14 +163,12 @@ ../../../config/msvcdefs.def - true Windows true true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib MachineX86 @@ -224,11 +215,9 @@ true ..\..\..\config\msvcdefs.def - true Windows true false - $(xrLibDir)$(TargetName).lib MachineX86 diff --git a/src/Externals/openal/OpenAL-Windows/Router/Router.vcxproj b/src/Externals/openal/OpenAL-Windows/Router/Router.vcxproj index ce72d679079..ef7c631c5b1 100644 --- a/src/Externals/openal/OpenAL-Windows/Router/Router.vcxproj +++ b/src/Externals/openal/OpenAL-Windows/Router/Router.vcxproj @@ -14,19 +14,18 @@ OpenAL32 {566551F4-4EF1-4CB4-A131-F982E7606907} OpenAL32 + 8.1 DynamicLibrary v140 - false MultiByte true DynamicLibrary v140 - false MultiByte @@ -46,13 +45,9 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -78,7 +73,6 @@ $(IntDir) Level3 - true ProgramDatabase CompileAsCpp @@ -88,11 +82,8 @@ version.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - true - true true false - $(xrLibDir)$(TargetName).lib MachineX86 @@ -128,7 +119,6 @@ $(IntDir) Level3 - true CompileAsCpp @@ -137,11 +127,9 @@ version.lib;winmm.lib;%(AdditionalDependencies) - true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib MachineX86 diff --git a/src/Layers/xrAPI/xrAPI.vcxproj b/src/Layers/xrAPI/xrAPI.vcxproj index 3e334220868..40e850dfd8a 100644 --- a/src/Layers/xrAPI/xrAPI.vcxproj +++ b/src/Layers/xrAPI/xrAPI.vcxproj @@ -14,6 +14,7 @@ {1DAEC516-E52C-4A3C-A4DA-AE3553E6E0F8} xrAPI Win32Proj + 8.1 @@ -43,13 +44,9 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -65,15 +62,12 @@ Fast Use Level4 - ProgramDatabase - $(SolutionDir);%(AdditionalIncludeDirectories) - true Windows false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -92,17 +86,14 @@ Fast Use Level4 - ProgramDatabase - $(SolutionDir);%(AdditionalIncludeDirectories) - true Windows true true false - $(xrLibDir)$(TargetName).lib MachineX86 + true diff --git a/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj b/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj index 8be7737c31d..5592c133766 100644 --- a/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj +++ b/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj @@ -18,6 +18,7 @@ {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2} xrRender_R1 Win32Proj + 8.11 @@ -59,26 +60,20 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false Disabled true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R1_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -92,20 +87,16 @@ true Use Level4 - ProgramDatabase -Zm150 %(AdditionalOptions) lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies) true - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) Windows - true false - false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -117,7 +108,7 @@ true true true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;WIN32;NDEBUG;_WINDOWS;_USRDLL;XRRENDER_R1_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -130,22 +121,18 @@ true Use Level4 - ProgramDatabase -Zm150 %(AdditionalOptions) lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies) - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true - NotSet - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + Windows true true UseLinkTimeCodeGeneration false - false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -156,7 +143,7 @@ Speed false true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R1_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -167,17 +154,14 @@ true Use Level4 - ProgramDatabase -Zm150 %(AdditionalOptions) lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies) - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) Windows true false - false $(xrLibDir)$(TargetName).lib MachineX86 diff --git a/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj b/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj index 6fb80496e5d..4589a0ea69e 100644 --- a/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj +++ b/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj @@ -18,6 +18,7 @@ {963BA4E5-499A-454D-B002-1D5ECE0527A6} xrRender_R2 Win32Proj + 8.11 @@ -59,26 +60,20 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false Disabled true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R2_EXPORTS;_SECURE_SCL=0;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions) true Sync @@ -91,19 +86,16 @@ true Use Level4 - ProgramDatabase -Zm150 %(AdditionalOptions) lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies) true - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) Windows - true false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -115,7 +107,7 @@ true true true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;WIN32;NDEBUG;_WINDOWS;_USRDLL;XRRENDER_R2_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -128,21 +120,18 @@ true Use Level4 - ProgramDatabase -Zm150 %(AdditionalOptions) lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies) - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true - NotSet - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + Windows true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -153,7 +142,7 @@ Speed false true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R2_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -169,8 +158,7 @@ lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies) - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) Windows true false diff --git a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj index 3caa9d48a94..2f88e8d107c 100644 --- a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj +++ b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj @@ -18,6 +18,7 @@ {3F383D3C-FCD8-4170-990B-EB4833F09248} xrRender_R3 Win32Proj + 8.11 @@ -59,26 +60,20 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false Disabled true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;MSAA_DX10_1;MSAA_SAMPLES=4;USE_MSAA;GBUFFER_OPTIMIZATION;USE_DX10;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R3_EXPORTS;_SECURE_SCL=0;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions) true Sync @@ -91,19 +86,16 @@ true Use Level4 - ProgramDatabase -Zm150 %(AdditionalOptions) lua51.lib;luabind.lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;dxgi.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies) true - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) Windows - true false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -115,7 +107,7 @@ true true true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;USE_DX10;WIN32;NDEBUG;_WINDOWS;_USRDLL;XRRENDER_R3_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -128,21 +120,18 @@ true Use Level4 - ProgramDatabase -Zm150 %(AdditionalOptions) lua51.lib;luabind.lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;dxgi.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies) - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true - NotSet - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + Windows true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -153,7 +142,7 @@ Speed false true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;USE_DX10;MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R3_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -169,8 +158,7 @@ lua51.lib;luabind.lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;dxgi.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies) - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) Windows true false diff --git a/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj b/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj index 981ae26bc65..4f19eb934ea 100644 --- a/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj +++ b/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj @@ -18,6 +18,7 @@ {AC9B12ED-A2D7-4337-A981-5BD8430E96D8} xrRender_R4 Win32Proj + 8.11 @@ -59,26 +60,20 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false Disabled true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;MSAA_DX10_1;MSAA_SAMPLES=4;USE_MSAA;GBUFFER_OPTIMIZATION;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R4_EXPORTS;_SECURE_SCL=0;USE_DX11;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions) true Sync @@ -91,19 +86,16 @@ true Use Level4 - ProgramDatabase -Zm150 %(AdditionalOptions) lua51.lib;luabind.lib;dxguid.lib;d3dx11.lib;oalib.lib;D3DCompiler.lib;d3d11.lib;dxgi.lib;nvapi.lib;d3d10.lib;%(AdditionalDependencies) true - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) Windows - true false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -115,7 +107,7 @@ true true true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;USE_DX11;WIN32;NDEBUG;_WINDOWS;_USRDLL;XRRENDER_R4_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -128,21 +120,18 @@ true Use Level4 - ProgramDatabase -Zm150 %(AdditionalOptions) lua51.lib;luabind.lib;dxguid.lib;d3dx11.lib;oalib.lib;D3DCompiler.lib;d3d11.lib;dxgi.lib;nvapi.lib;d3d10.lib;%(AdditionalDependencies) - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true - NotSet - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + Windows true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -153,7 +142,7 @@ Speed false true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R4_EXPORTS;_SECURE_SCL=0;USE_DX11;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -169,8 +158,7 @@ lua51.lib;luabind.lib;dxguid.lib;d3dx11.lib;oalib.lib;D3DCompiler.lib;d3d11.lib;dxgi.lib;nvapi.lib;d3d10.lib;%(AdditionalDependencies) - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) Windows true false diff --git a/src/editors/xrManagedApi/xrManagedApi.vcxproj b/src/editors/xrManagedApi/xrManagedApi.vcxproj index 566e4d743cd..1620642361d 100644 --- a/src/editors/xrManagedApi/xrManagedApi.vcxproj +++ b/src/editors/xrManagedApi/xrManagedApi.vcxproj @@ -15,6 +15,7 @@ v4.0 ManagedCProj xrManagedApi + 8.1 @@ -44,13 +45,9 @@ - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -59,14 +56,12 @@ Disabled XR_MANAGED_API;WIN32;DEBUG;%(PreprocessorDefinitions) Use - .;$(SolutionDir);$(xrSdkDir)include Pch.hpp MultiThreadedDLL true xrCore.lib;xrGame.lib - $(xrLibDir) @@ -74,14 +69,12 @@ Level3 XR_MANAGED_API;WIN32;NDEBUG;%(PreprocessorDefinitions) Use - .;$(SolutionDir);$(xrSdkDir)include Pch.hpp MultiThreadedDLL true xrCore.lib;xrGame.lib - $(xrLibDir) diff --git a/src/editors/xrPostprocessEditor/xrPostprocessEditor.csproj b/src/editors/xrPostprocessEditor/xrPostprocessEditor.csproj index 5afb289d94e..d743c2568fe 100644 --- a/src/editors/xrPostprocessEditor/xrPostprocessEditor.csproj +++ b/src/editors/xrPostprocessEditor/xrPostprocessEditor.csproj @@ -21,7 +21,7 @@ true $(xrBinDir) - $(xrIntDir)$(AssemblyName)\ + $(xrIntDir)$(AssemblyName) DEBUG;TRACE full x86 @@ -30,7 +30,7 @@ $(xrBinDir) - $(xrIntDir)$(AssemblyName)\ + $(xrIntDir)$(AssemblyName) TRACE true pdbonly diff --git a/src/editors/xrSdkControls/xrSdkControls.csproj b/src/editors/xrSdkControls/xrSdkControls.csproj index 30931a84851..6db578e9de6 100644 --- a/src/editors/xrSdkControls/xrSdkControls.csproj +++ b/src/editors/xrSdkControls/xrSdkControls.csproj @@ -18,7 +18,7 @@ true $(xrBinDir) - $(xrIntDir)$(AssemblyName)\ + $(xrIntDir)$(AssemblyName) DEBUG;TRACE full x86 @@ -27,7 +27,7 @@ $(xrBinDir) - $(xrIntDir)$(AssemblyName)\ + $(xrIntDir)$(AssemblyName) TRACE true pdbonly diff --git a/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj b/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj index dd48783822f..ab5e23dd248 100644 --- a/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj +++ b/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj @@ -14,6 +14,7 @@ {492D3DFE-9068-4E7E-A008-7C2420A651C0} editor ManagedCProj + 8.1 @@ -45,58 +46,46 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false Disabled - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;DEBUG;EDITOR_LIBRARY;%(PreprocessorDefinitions) MultiThreadedDLL Fast Use pch.hpp Level4 - ProgramDatabase 4945;%(DisableSpecificWarnings) /ignore:4248 %(AdditionalOptions) - $(xrSdkDir)libraries;%(AdditionalLibraryDirectories) true true false - $(xrLibDir)$(TargetName).lib MachineX86 - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;EDITOR_LIBRARY;%(PreprocessorDefinitions) MultiThreadedDLL Fast Use pch.hpp Level4 - ProgramDatabase - $(xrSdkDir)libraries;%(AdditionalLibraryDirectories) true true true false - $(xrLibDir)$(TargetName).lib MachineX86 diff --git a/src/plugins/Max/MAX_Export60.vcxproj b/src/plugins/Max/MAX_Export60.vcxproj index 22aee5d0023..34aef64fc91 100644 --- a/src/plugins/Max/MAX_Export60.vcxproj +++ b/src/plugins/Max/MAX_Export60.vcxproj @@ -62,22 +62,25 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ true true + $(xrPlugBinDir)3DSMax6 + XRayExport + .dlu - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ true false + $(xrPlugBinDir)3DSMax6 + XRayExport + .dlu - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ true false + $(xrPlugBinDir)3DSMax6 + XRayExport + .dlu @@ -89,7 +92,7 @@ Disabled - $(DXSDK_DIR)Include;$(SolutionDir);$(SolutionDir)Externals\3dsmax/ver-6.0/include;$(SolutionDir)Externals\3dsmax/ver-6.0/cssdk/include;$(SolutionDir)plugins\shared;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\3dsmax/ver-6.0/include;$(SolutionDir)Externals\3dsmax/ver-6.0/cssdk/include;$(SolutionDir)plugins\shared;%(AdditionalIncludeDirectories) DEBUG;WIN32;_WINDOWS;_USRDLL;_EXPORT;_MAX_EXPORT;_MAX_PLUGIN;%(PreprocessorDefinitions) true Sync @@ -102,9 +105,6 @@ stdafx.h true Level3 - true - EditAndContinue - Cdecl _DEBUG;%(PreprocessorDefinitions) @@ -113,12 +113,9 @@ /MACHINE:I386 %(AdditionalOptions) mesh.lib;geom.lib;gfx.lib;maxutil.lib;core.lib;paramblk2.lib;comctl32.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies) - $(OutDir)xray_export.dlu true $(SolutionDir)Externals\bugtrap\bin;$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\3dsmax/ver-6.0/lib;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) Export\Utility.def - $(OutDir)xray_export.pdb - true 0x08970000 false @@ -134,7 +131,7 @@ AnySuitable true - $(DXSDK_DIR)Include;$(SolutionDir);$(SolutionDir)Externals\3dsmax/ver-6.0/include;$(SolutionDir)Externals\3dsmax/ver-6.0/cssdk/include;$(SolutionDir)plugins\shared;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\3dsmax/ver-6.0/include;$(SolutionDir)Externals\3dsmax/ver-6.0/cssdk/include;$(SolutionDir)plugins\shared;%(AdditionalIncludeDirectories) UTILITY_EXPORTS;WIN32;_WINDOWS;_USRDLL;_MAX_EXPORT;_MAX_PLUGIN;%(PreprocessorDefinitions) true false @@ -148,7 +145,6 @@ stdafx.h Level3 - true false StreamingSIMDExtensions2 @@ -159,11 +155,9 @@ /MACHINE:I386 %(AdditionalOptions) mesh.lib;geom.lib;gfx.lib;maxutil.lib;core.lib;paramblk2.lib;comctl32.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies) - $(OutDir)xray_export.dlu true $(SolutionDir)Externals\bugtrap\bin;$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\3dsmax/ver-6.0/lib;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) Export\Utility.def - $(OutDir)xray_export.pdb true 0x08970000 false @@ -180,7 +174,7 @@ Disabled AnySuitable - $(DXSDK_DIR)Include;$(SolutionDir);$(SolutionDir)Externals\3dsmax/ver-6.0/include;$(SolutionDir)Externals\3dsmax/ver-6.0/cssdk/include;$(SolutionDir)plugins\shared;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\3dsmax/ver-6.0/include;$(SolutionDir)Externals\3dsmax/ver-6.0/cssdk/include;$(SolutionDir)plugins\shared;%(AdditionalIncludeDirectories) UTILITY_EXPORTS;WIN32;_WINDOWS;_USRDLL;_MAX_EXPORT;_MAX_PLUGIN;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -190,8 +184,6 @@ stdafx.h true Level3 - true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -200,12 +192,9 @@ /MACHINE:I386 %(AdditionalOptions) d3dx.lib;mesh.lib;geom.lib;gfx.lib;maxutil.lib;core.lib;paramblk2.lib;comctl32.lib;odbc32.lib;odbccp32.lib;Winmm.lib;R:\MagicFM\Sdk\Library\Release\MagicFM.lib;%(AdditionalDependencies) - $(OutDir)xray_export.dlu true $(XRAY_15X_LIBS)\bugtrap\bin;$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\3dsmax/ver-6.0/lib;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) Export\Utility.def - $(OutDir)xray_export.pdb - true false false true diff --git a/src/plugins/Max/MAX_Material60.vcxproj b/src/plugins/Max/MAX_Material60.vcxproj index 4ee0cfda7b7..b493ea07f8c 100644 --- a/src/plugins/Max/MAX_Material60.vcxproj +++ b/src/plugins/Max/MAX_Material60.vcxproj @@ -44,14 +44,16 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ true + $(xrPlugBinDir)3DSMax6 + XRayMaterial + .dlt - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ false + $(xrPlugBinDir)3DSMax6 + XRayMaterial + .dlt @@ -64,7 +66,7 @@ /LD %(AdditionalOptions) Disabled - $(SolutionDir);$(SolutionDir)Externals\3dsmax/ver-6.0/include;$(SolutionDir)Externals\3dsmax/ver-6.0/cssdk/include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\3dsmax/ver-6.0/include;$(SolutionDir)Externals\3dsmax/ver-6.0/cssdk/include;%(AdditionalIncludeDirectories) DEBUG;WIN32;_WINDOWS;_USRDLL;_MAX_MATERIAL;_MAX_PLUGIN;%(PreprocessorDefinitions) true Sync @@ -74,10 +76,6 @@ true Use Level3 - true - EditAndContinue - Cdecl - Default _DEBUG;%(PreprocessorDefinitions) @@ -86,12 +84,9 @@ /MACHINE:I386 %(AdditionalOptions) Winmm.lib;comctl32.lib;bmm.lib;core.lib;geom.lib;gfx.lib;mesh.lib;maxutil.lib;maxscrpt.lib;manipsys.lib;paramblk2.lib;%(AdditionalDependencies) - $(OutDir)xray_material.dlt true $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;$(SolutionDir)Externals\3dsmax/ver-6.0/lib;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) ..\Shared\GameMaterial.def - true - $(OutDir)xray_material.pdb Windows 0x3e0e0000 false @@ -108,7 +103,7 @@ /LD %(AdditionalOptions) OnlyExplicitInline - $(SolutionDir);$(SolutionDir)Externals\3dsmax/ver-6.0/include;$(SolutionDir)Externals\3dsmax/ver-6.0/cssdk/include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\3dsmax/ver-6.0/include;$(SolutionDir)Externals\3dsmax/ver-6.0/cssdk/include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;_MAX_MATERIAL;_MAX_PLUGIN;%(PreprocessorDefinitions) true false @@ -120,9 +115,6 @@ true Use Level3 - true - Cdecl - Default StreamingSIMDExtensions2 @@ -132,11 +124,9 @@ /MACHINE:I386 %(AdditionalOptions) Winmm.lib;comctl32.lib;core.lib;geom.lib;gfx.lib;mesh.lib;maxutil.lib;maxscrpt.lib;manipsys.lib;paramblk2.lib;%(AdditionalDependencies) - $(OutDir)xray_material.dlt true $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;$(SolutionDir)Externals\3dsmax/ver-6.0/lib;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) ..\Shared\GameMaterial.def - $(OutDir)xray_material.pdb Windows true 0x3e0e0000 diff --git a/src/plugins/Maya/Maya_Export2008.vcxproj b/src/plugins/Maya/Maya_Export2008.vcxproj index ecda01df876..e96b204daa5 100644 --- a/src/plugins/Maya/Maya_Export2008.vcxproj +++ b/src/plugins/Maya/Maya_Export2008.vcxproj @@ -44,14 +44,16 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ true + $(xrPlugBinDir)Maya2008 + XRayExport + .mll - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ false + $(xrPlugBinDir)Maya2008 + XRayExport + .mll @@ -63,7 +65,7 @@ Disabled - $(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals\maya/ver-2008/include;../Shared;$(SolutionDir)utils/xrQSlim/src;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\maya/ver-2008/include;../Shared;$(SolutionDir)utils/xrQSlim/src;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories) DEBUG;WIN32;_WINDOWS;NT_PLUGIN;_MAYA_EXPORT;_MAYA_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions) true Sync @@ -73,10 +75,7 @@ true Use Level3 - true - EditAndContinue Cdecl - Default _DEBUG;%(PreprocessorDefinitions) @@ -85,11 +84,9 @@ /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;%(AdditionalDependencies) - $(OutDir)xrayMaya_export.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\maya/ver-2008/lib;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) true - $(OutDir)xrayMaya_export.pdb Windows false @@ -104,7 +101,7 @@ OnlyExplicitInline - $(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals\maya/ver-2008/include;../Shared;$(SolutionDir)utils/xrQSlim/src;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\maya/ver-2008/include;../Shared;$(SolutionDir)utils/xrQSlim/src;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;NT_PLUGIN;_MAYA_EXPORT;_MAYA_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions) true false @@ -116,8 +113,6 @@ true Use Level3 - true - Default StreamingSIMDExtensions2 @@ -127,10 +122,8 @@ /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;%(AdditionalDependencies) - $(OutDir)xrayMaya_export.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\maya/ver-2008/lib;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) - $(OutDir)xrayMaya_export.pdb Windows false diff --git a/src/plugins/Maya/Maya_Export2009.vcxproj b/src/plugins/Maya/Maya_Export2009.vcxproj index d4e9ae61999..a03b5944f9c 100644 --- a/src/plugins/Maya/Maya_Export2009.vcxproj +++ b/src/plugins/Maya/Maya_Export2009.vcxproj @@ -44,14 +44,16 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ true + $(xrPlugBinDir)Maya2009 + XRayExport + .mll - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ false + $(xrPlugBinDir)Maya2009 + XRayExport + .mll @@ -63,7 +65,7 @@ Disabled - $(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals\maya/ver-2009/include;../Shared;$(SolutionDir)xrEngine;$(SolutionDir)utils/xrQSlim/src/;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\maya/ver-2009/include;../Shared;$(SolutionDir)xrEngine;$(SolutionDir)utils/xrQSlim/src/;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories) DEBUG;WIN32;_WINDOWS;NT_PLUGIN;_MAYA_EXPORT;_MAYA_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions) true Sync @@ -73,10 +75,7 @@ true Use Level3 - true - EditAndContinue Cdecl - Default _DEBUG;%(PreprocessorDefinitions) @@ -86,11 +85,9 @@ /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;%(AdditionalDependencies) - $(OutDir)xrayMaya_export.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\maya/ver-2009/lib;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) true - $(OutDir)xrayMaya_export.pdb Windows false @@ -105,7 +102,7 @@ OnlyExplicitInline - $(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals\maya/ver-2009/include;../Shared;$(SolutionDir)xrEngine;$(SolutionDir)utils/xrQSlim/src/;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\maya/ver-2009/include;../Shared;$(SolutionDir)xrEngine;$(SolutionDir)utils/xrQSlim/src/;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;NT_PLUGIN;_MAYA_EXPORT;_MAYA_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions) true false @@ -117,8 +114,6 @@ true Use Level3 - true - Default StreamingSIMDExtensions2 @@ -128,10 +123,8 @@ /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;%(AdditionalDependencies) - $(OutDir)xrayMaya_export.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\maya/ver-2009/lib;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) - $(OutDir)xrayMaya_export.pdb Windows false diff --git a/src/plugins/Maya/Maya_Material2008.vcxproj b/src/plugins/Maya/Maya_Material2008.vcxproj index 4524d6c0ef6..5a3e37eb644 100644 --- a/src/plugins/Maya/Maya_Material2008.vcxproj +++ b/src/plugins/Maya/Maya_Material2008.vcxproj @@ -44,14 +44,16 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ true + $(xrPlugBinDir)Maya2008 + XRayMaterial + .mll - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ false + $(xrPlugBinDir)Maya2008 + XRayMaterial + .mll @@ -63,7 +65,7 @@ Disabled - $(SolutionDir);$(SolutionDir)Externals\maya/ver-2008/include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\maya/ver-2008/include;%(AdditionalIncludeDirectories) DEBUG;WIN32;_WINDOWS;NT_PLUGIN;_MAYA_MATERIAL;_MAYA_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions) true Sync @@ -73,10 +75,7 @@ true Use Level3 - true - EditAndContinue Cdecl - Default _DEBUG;%(PreprocessorDefinitions) @@ -86,11 +85,9 @@ /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaRender.lib;OpenMayaUI.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(OutDir)xrayMaya_material.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\maya/ver-2008/lib;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) true - $(OutDir)xrayMaya_material.pdb Windows false @@ -105,7 +102,7 @@ OnlyExplicitInline - $(SolutionDir);$(SolutionDir)Externals\maya/ver-2008/include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\maya/ver-2008/include;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;NT_PLUGIN;_MAYA_MATERIAL;_MAYA_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions) true false @@ -117,8 +114,6 @@ true Use Level3 - true - Default StreamingSIMDExtensions2 @@ -128,10 +123,8 @@ /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaRender.lib;OpenMayaUI.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(OutDir)xrayMaya_material.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\maya/ver-2008/lib;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) - $(OutDir)xrayMaya_material.pdb Windows false diff --git a/src/plugins/Maya/Maya_Material2009.vcxproj b/src/plugins/Maya/Maya_Material2009.vcxproj index 13605e5baf3..7e516bdf94a 100644 --- a/src/plugins/Maya/Maya_Material2009.vcxproj +++ b/src/plugins/Maya/Maya_Material2009.vcxproj @@ -44,14 +44,16 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ true + $(xrPlugBinDir)Maya2009 + XRayMaterial + .mll - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ false + $(xrPlugBinDir)Maya2009 + XRayMaterial + .mll @@ -63,7 +65,7 @@ Disabled - $(SolutionDir);$(SolutionDir)Externals\maya/ver-2009/include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\maya/ver-2009/include;%(AdditionalIncludeDirectories) DEBUG;WIN32;_WINDOWS;NT_PLUGIN;_MAYA_MATERIAL;_MAYA_PLUGIN;%(PreprocessorDefinitions) true Sync @@ -73,10 +75,7 @@ true Use Level3 - true - EditAndContinue Cdecl - Default _DEBUG;%(PreprocessorDefinitions) @@ -86,11 +85,9 @@ /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaRender.lib;OpenMayaUI.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(OutDir)xrayMaya_material.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\maya/ver-2009/lib;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) true - $(OutDir)xrayMaya_material.pdb Windows false @@ -105,7 +102,7 @@ OnlyExplicitInline - $(SolutionDir);$(SolutionDir)Externals\maya/ver-2009/include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\maya/ver-2009/include;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;NT_PLUGIN;_MAYA_MATERIAL;_MAYA_PLUGIN;%(PreprocessorDefinitions) true false @@ -117,8 +114,6 @@ true Use Level3 - true - Default StreamingSIMDExtensions2 @@ -128,10 +123,8 @@ /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaRender.lib;OpenMayaUI.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(OutDir)xrayMaya_material.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\maya/ver-2009/lib;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories) - $(OutDir)xrayMaya_material.pdb Windows false diff --git a/src/plugins/lw/LW_Export80.vcxproj b/src/plugins/lw/LW_Export80.vcxproj index 0a5a8f13f7b..c0df312b75c 100644 --- a/src/plugins/lw/LW_Export80.vcxproj +++ b/src/plugins/lw/LW_Export80.vcxproj @@ -45,14 +45,16 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ false + $(xrPlugBinDir)LightWave + XRayExport + .p - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ true + $(xrPlugBinDir)LightWave + XRayExport + .p @@ -64,7 +66,7 @@ OnlyExplicitInline - $(SolutionDir);$(SolutionDir)Externals\lightwave/ver-8.0/include;$(SolutionDir)Externals\lightwave/ver-8.0/include/lwsdk;../Shared;$(ProjectDir)export;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\lightwave/ver-8.0/include;$(SolutionDir)Externals\lightwave/ver-8.0/include/lwsdk;../Shared;$(ProjectDir)export;%(AdditionalIncludeDirectories) NDEBUG;_X86_;_WIN32;WIN32;_WINDOWS;_USRDLL;_LW_PLUGIN;_LW_EXPORT;%(PreprocessorDefinitions) true @@ -81,7 +83,6 @@ $(IntDir) false Level3 - true StreamingSIMDExtensions2 @@ -90,12 +91,10 @@ /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;lw_server.lib;%(AdditionalDependencies) - $(OutDir)xray_export.p + odbc32.lib;odbccp32.lib;LW_Server.lib;%(AdditionalDependencies) true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;Server\$(Configuration);$(xrLibDir);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;%(AdditionalLibraryDirectories) Server\serv.def - false @@ -110,7 +109,7 @@ Disabled - $(SolutionDir);$(SolutionDir)Externals\lightwave/ver-8.0/include;$(SolutionDir)Externals\lightwave/ver-8.0/include/lwsdk;../Shared;$(ProjectDir)export;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\lightwave/ver-8.0/include;$(SolutionDir)Externals\lightwave/ver-8.0/include/lwsdk;../Shared;$(ProjectDir)export;%(AdditionalIncludeDirectories) DEBUG;_X86_;_WIN32;WIN32;_WINDOWS;_USRDLL;_LW_PLUGIN;_LW_EXPORT;%(PreprocessorDefinitions) true Sync @@ -125,8 +124,6 @@ false Level3 - true - EditAndContinue Cdecl @@ -135,13 +132,10 @@ /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;lw_server.lib;%(AdditionalDependencies) - $(OutDir)xray_export.p + odbc32.lib;odbccp32.lib;LW_Server.lib;%(AdditionalDependencies) true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;Server\$(Configuration);$(xrLibDir);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;%(AdditionalLibraryDirectories) Server\serv.def - true - $(OutDir)xray_export.pdb false diff --git a/src/plugins/lw/LW_Server.vcxproj b/src/plugins/lw/LW_Server.vcxproj index fcb5037d9b4..818ffeabd9b 100644 --- a/src/plugins/lw/LW_Server.vcxproj +++ b/src/plugins/lw/LW_Server.vcxproj @@ -44,12 +44,10 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ + $(xrPlugBinDir)LightWave - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ + $(xrPlugBinDir)LightWave @@ -65,7 +63,6 @@ Fast false Level3 - true StreamingSIMDExtensions2 @@ -73,7 +70,6 @@ 0x0419 - $(xrLibDir)$(TargetName).lib true @@ -89,15 +85,12 @@ Fast false Level3 - true - EditAndContinue _DEBUG;%(PreprocessorDefinitions) 0x0419 - $(xrLibDir)$(TargetName).lib true diff --git a/src/plugins/lw/LW_Shader80.vcxproj b/src/plugins/lw/LW_Shader80.vcxproj index 632948b4dcf..666a8bd7b4e 100644 --- a/src/plugins/lw/LW_Shader80.vcxproj +++ b/src/plugins/lw/LW_Shader80.vcxproj @@ -45,14 +45,16 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ false + $(xrPlugBinDir)LightWave + XRayShader + .p - $(xrBinPlugDir)$(ProjectName)\ - $(xrIntDir)$(ProjectName)\ true + $(xrPlugBinDir)LightWave + XRayShader + .p @@ -64,7 +66,7 @@ OnlyExplicitInline - $(SolutionDir);$(SolutionDir)Externals\lightwave/ver-8.0/include;$(SolutionDir)Externals\lightwave/ver-8.0/include/lwsdk;../Shared;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\lightwave/ver-8.0/include;$(SolutionDir)Externals\lightwave/ver-8.0/include/lwsdk;../Shared;%(AdditionalIncludeDirectories) NDEBUG;_X86_;_WIN32;WIN32;_WINDOWS;_USRDLL;_LW_PLUGIN;_LW_SHADER;%(PreprocessorDefinitions) true @@ -76,8 +78,6 @@ stdafx.h Level3 - true - Cdecl StreamingSIMDExtensions2 @@ -87,9 +87,8 @@ /MACHINE:I386 %(AdditionalOptions) odbc32.lib;odbccp32.lib;lw_server.lib;%(AdditionalDependencies) - $(OutDir)xray_shader.p true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;%(AdditionalLibraryDirectories) Server\serv.def false @@ -104,7 +103,7 @@ Disabled - $(SolutionDir);$(SolutionDir)Externals\lightwave/ver-8.0/include;$(SolutionDir)Externals\lightwave/ver-8.0/include/lwsdk;../Shared;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\lightwave/ver-8.0/include;$(SolutionDir)Externals\lightwave/ver-8.0/include/lwsdk;../Shared;%(AdditionalIncludeDirectories) DEBUG;_X86_;WIN32;_WINDOWS;_USRDLL;_EXPORT;_LW_SHADER;%(PreprocessorDefinitions) true true @@ -119,9 +118,6 @@ stdafx.h Level3 - true - EditAndContinue - Cdecl _DEBUG;%(PreprocessorDefinitions) @@ -130,12 +126,9 @@ /MACHINE:I386 %(AdditionalOptions) odbc32.lib;odbccp32.lib;lw_server.lib;%(AdditionalDependencies) - $(OutDir)xray_shader.p true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;%(AdditionalLibraryDirectories) Server\serv.def - true - $(OutDir)xray_shader.pdb false diff --git a/src/utils/CompressionTest/CompressionTest.vcxproj b/src/utils/CompressionTest/CompressionTest.vcxproj index ebc3d30bdd5..cca05bac010 100644 --- a/src/utils/CompressionTest/CompressionTest.vcxproj +++ b/src/utils/CompressionTest/CompressionTest.vcxproj @@ -14,6 +14,7 @@ {C961EA19-716C-4A6D-BB13-689F8FB78B01} CompressionTest Win32Proj + 8.1 @@ -44,30 +45,22 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false Disabled - $(SolutionDir);%(AdditionalIncludeDirectories) WIN32;DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDLL Level3 - EditAndContinue - $(xrSdkDir)libraries;%(AdditionalLibraryDirectories) - true Console false MachineX86 @@ -75,7 +68,6 @@ - $(SolutionDir);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -83,12 +75,9 @@ true Level3 - ProgramDatabase StreamingSIMDExtensions2 - $(xrSdkDir)libraries;%(AdditionalLibraryDirectories) - true Console true true diff --git a/src/utils/ETools/ETools.vcxproj b/src/utils/ETools/ETools.vcxproj index de4aae0b8f9..5c6071ae521 100644 --- a/src/utils/ETools/ETools.vcxproj +++ b/src/utils/ETools/ETools.vcxproj @@ -16,24 +16,22 @@ {65CBB9D0-FBC6-41A4-8316-F5E9B5D7FB33} + 8.1 DynamicLibrary v140 - false MultiByte DynamicLibrary v140 - false MultiByte DynamicLibrary v140 - false MultiByte true @@ -60,19 +58,13 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -91,7 +83,7 @@ true true true - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;ETOOLS_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -105,8 +97,6 @@ Use stdafx.h Level3 - true - ProgramDatabase Cdecl @@ -116,16 +106,14 @@ /MACHINE:I386 %(AdditionalOptions) libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;%(AdditionalDependencies) - false - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories) user32.lib;%(IgnoreSpecificDefaultLibraries) - true true true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib + MachineX86 @@ -139,7 +127,7 @@ Disabled true - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;_USRDLL;ETOOLS_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -150,8 +138,6 @@ Use stdafx.h Level4 - true - ProgramDatabase Cdecl false @@ -162,14 +148,12 @@ /MACHINE:I386 %(AdditionalOptions) libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;%(AdditionalDependencies) - true - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Debug;%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Debug;%(AdditionalLibraryDirectories) user32.lib;%(IgnoreSpecificDefaultLibraries) - true Windows true false - $(xrLibDir)$(TargetName).lib + MachineX86 @@ -186,7 +170,7 @@ true Speed true - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;ETOOLS_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -198,8 +182,6 @@ Use stdafx.h Level3 - true - ProgramDatabase Cdecl @@ -209,8 +191,7 @@ /MACHINE:I386 /NODEFAULTLIB:user32 %(AdditionalOptions) libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;%(AdditionalDependencies) - true - $(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories) user32.dll;%(IgnoreSpecificDefaultLibraries) true Windows @@ -218,7 +199,6 @@ true true false - $(xrLibDir)$(TargetName).lib diff --git a/src/utils/LWO/LWO.vcxproj b/src/utils/LWO/LWO.vcxproj index 1a9576a94bd..f7f1365b8e1 100644 --- a/src/utils/LWO/LWO.vcxproj +++ b/src/utils/LWO/LWO.vcxproj @@ -12,6 +12,7 @@ {A6EBBBBB-5FEF-4C20-8460-DFAB11734DED} + 8.1 @@ -44,13 +45,9 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true @@ -71,10 +68,8 @@ $(IntDir) $(IntDir) Level3 - true StdCall StreamingSIMDExtensions2 - $(SolutionDir);%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) @@ -86,6 +81,7 @@ true false $(xrLibDir)$(TargetName).lib + MachineX86 @@ -105,10 +101,7 @@ $(IntDir) $(IntDir) Level3 - true - EditAndContinue StdCall - $(SolutionDir);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) @@ -119,9 +112,9 @@ odbc32.lib;odbccp32.lib;%(AdditionalDependencies) true $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true false $(xrLibDir)$(TargetName).lib + MachineX86 diff --git a/src/utils/ctool/ctool.vcxproj b/src/utils/ctool/ctool.vcxproj index f31707c9bed..cbd55b1c020 100644 --- a/src/utils/ctool/ctool.vcxproj +++ b/src/utils/ctool/ctool.vcxproj @@ -14,6 +14,7 @@ {2FAAC8BA-369F-465E-B465-2235963FD377} ctool Win32Proj + 8.1 @@ -43,54 +44,40 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false Disabled - $(SolutionDir);%(AdditionalIncludeDirectories) WIN32;DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDLL Level3 - EditAndContinue - $(xrSdkDir)libraries;%(AdditionalLibraryDirectories) - true Console false - MachineX86 - $(SolutionDir);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL Level3 - ProgramDatabase StreamingSIMDExtensions2 - $(xrSdkDir)libraries;%(AdditionalLibraryDirectories) - true Console true true false - MachineX86 diff --git a/src/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj b/src/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj index 0e029ef7f06..545562c0dc1 100644 --- a/src/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj +++ b/src/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj @@ -13,6 +13,7 @@ {1924EF23-A05E-40E5-93F2-6CCD64BE1F8B} mp_configs_info + 8.1 @@ -41,18 +42,11 @@ <_ProjectFileVersion>12.0.30501.0 - - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - - - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - + + Disabled - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -61,34 +55,27 @@ Use pch.h Level4 - EditAndContinue $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true false - MachineX86 - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) MultiThreadedDLL false StreamingSIMDExtensions2 Fast Level4 - ProgramDatabase $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true true true false - MachineX86 diff --git a/src/utils/mp_screenshots_info/mp_screenshots_info.vcxproj b/src/utils/mp_screenshots_info/mp_screenshots_info.vcxproj index 05c3eb1bc1c..215ae17bd24 100644 --- a/src/utils/mp_screenshots_info/mp_screenshots_info.vcxproj +++ b/src/utils/mp_screenshots_info/mp_screenshots_info.vcxproj @@ -13,6 +13,7 @@ {032A10AB-E44C-4751-A290-001EF99E664A} mp_screenshots_info + 8.1 @@ -41,18 +42,11 @@ <_ProjectFileVersion>12.0.30501.0 - - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - - - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - + + Disabled - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;DEBUG;%(PreprocessorDefinitions) true Sync @@ -62,20 +56,16 @@ Use pch.h Level4 - EditAndContinue $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Console false - MachineX86 - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) MultiThreadedDLL false @@ -84,17 +74,14 @@ Use pch.h Level4 - ProgramDatabase $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true - $(OutDir)$(ProjectName).pdb + $(OutDir)$(TargetName).pdb Console true true false - MachineX86 diff --git a/src/utils/xrAI/xrAI.vcxproj b/src/utils/xrAI/xrAI.vcxproj index e3f9ff1232d..35a708db9e8 100644 --- a/src/utils/xrAI/xrAI.vcxproj +++ b/src/utils/xrAI/xrAI.vcxproj @@ -16,6 +16,7 @@ {EA5932F3-02FE-4AD3-89E8-7072DC465D25} + 8.1 @@ -60,18 +61,12 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -84,7 +79,7 @@ Disabled - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;$(SolutionDir)Externals\FreeImage\Dist;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)xrServerEntities;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;$(SolutionDir)Externals\FreeImage\Dist;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;DEBUG;AI_COMPILER;_SECURE_SCL=0;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -97,8 +92,6 @@ stdafx.h Level4 - true - ProgramDatabase false @@ -109,7 +102,6 @@ /MACHINE:I386 %(AdditionalOptions) true $(DXSDK_DIR)Lib\x86;$(xrLibDir);$(xrSdkDir)libraries;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\MagicSoftware\Sdk\Library\DebugDLL;%(AdditionalLibraryDirectories) - true false Windows 0 @@ -117,7 +109,7 @@ true false $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 FreeImaged.lib;%(AdditionalDependencies) @@ -137,7 +129,7 @@ true true true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;$(SolutionDir)Externals\FreeImage\Dist;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)xrServerEntities;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;$(SolutionDir)Externals\FreeImage\Dist;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;AI_COMPILER;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -152,8 +144,6 @@ stdafx.h Level3 - true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -163,7 +153,6 @@ /MACHINE:I386 %(AdditionalOptions) true $(DXSDK_DIR)Lib\x86;$(xrLibDir);$(xrSdkDir)libraries;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\MagicSoftware\Sdk\Library\ReleaseDLL;%(AdditionalLibraryDirectories) - true Windows 0 0 @@ -171,7 +160,7 @@ UseLinkTimeCodeGeneration false $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 FreeImage.lib;%(AdditionalDependencies) @@ -190,7 +179,7 @@ Speed false true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;$(SolutionDir)Externals\FreeImage\Dist;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)xrServerEntities;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;$(SolutionDir)Externals\FreeImage\Dist;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;AI_COMPILER;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -204,8 +193,6 @@ stdafx.h Level3 - true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) diff --git a/src/utils/xrCompress/xrCompress.vcxproj b/src/utils/xrCompress/xrCompress.vcxproj index 329117d9f36..c551c287774 100644 --- a/src/utils/xrCompress/xrCompress.vcxproj +++ b/src/utils/xrCompress/xrCompress.vcxproj @@ -16,25 +16,23 @@ {EF76867B-6EB8-4DC0-A1D6-E964FAD6FC7B} + 8.1 Application v140 - false MultiByte false Application v140 - false MultiByte Application v140 - false MultiByte true @@ -61,19 +59,12 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - + $(OutDir)$(TargetName).tlb @@ -86,7 +77,6 @@ true true true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -100,7 +90,6 @@ stdafx.h Level3 - true NDEBUG;%(PreprocessorDefinitions) @@ -110,13 +99,13 @@ /MACHINE:I386 %(AdditionalOptions) true $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Console true true true UseLinkTimeCodeGeneration false + MachineX86 @@ -125,7 +114,6 @@ Disabled - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_CONSOLE;_SECURE_SCL=0;%(PreprocessorDefinitions) true true @@ -141,8 +129,6 @@ stdafx.h Level3 - true - EditAndContinue _DEBUG;%(PreprocessorDefinitions) @@ -152,10 +138,10 @@ /MACHINE:I386 %(AdditionalOptions) true $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Console true false + MachineX86 @@ -168,7 +154,6 @@ true Speed true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_CONSOLE;MIXED;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -180,8 +165,6 @@ stdafx.h Level3 - true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) diff --git a/src/utils/xrDO_Light/xrDO_Light.vcxproj b/src/utils/xrDO_Light/xrDO_Light.vcxproj index fe8250665cb..7a4d1fe3a25 100644 --- a/src/utils/xrDO_Light/xrDO_Light.vcxproj +++ b/src/utils/xrDO_Light/xrDO_Light.vcxproj @@ -16,25 +16,23 @@ {B730F54D-1199-481A-AAD0-5DB684E067C0} + 8.1 Application v140 - false MultiByte Application v140 - false MultiByte true Application v140 - false MultiByte @@ -60,18 +58,12 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -84,7 +76,7 @@ Disabled - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;_SECURE_SCL=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDLL @@ -95,8 +87,6 @@ stdafx.h Level3 - true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -106,11 +96,11 @@ /MACHINE:I386 %(AdditionalOptions) true $(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows true false $(xrLibDir)$(TargetName).lib + MachineX86 @@ -129,7 +119,7 @@ true true true - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -144,8 +134,6 @@ stdafx.h Level3 - true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -155,12 +143,12 @@ /MACHINE:I386 %(AdditionalOptions) true $(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows true UseLinkTimeCodeGeneration false $(xrLibDir)$(TargetName).lib + MachineX86 @@ -178,7 +166,7 @@ Speed false true - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) MIXED;WIN32;DEBUG;_WINDOWS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -191,8 +179,6 @@ stdafx.h Level3 - true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) diff --git a/src/utils/xrDXT/DXT.vcxproj b/src/utils/xrDXT/DXT.vcxproj index f33947e5e55..e61049237a8 100644 --- a/src/utils/xrDXT/DXT.vcxproj +++ b/src/utils/xrDXT/DXT.vcxproj @@ -17,25 +17,23 @@ {EBF9B543-0830-4866-9B48-DC0740E87E8A} DXT + 8.1 DynamicLibrary v140 - false MultiByte true DynamicLibrary v140 - false MultiByte DynamicLibrary v140 - false MultiByte true @@ -62,18 +60,12 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -92,7 +84,7 @@ true true true - .;$(SolutionDir);$(SolutionDir)Externals\nvtt\include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\nvtt\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;DXT_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -110,8 +102,6 @@ $(IntDir) Level3 - true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -119,10 +109,7 @@ /MACHINE:I386 %(AdditionalOptions) - true - $(xrLibDir);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) - true $(OutDir)$(TargetName).pdb false @@ -130,7 +117,8 @@ true true UseLinkTimeCodeGeneration - $(xrLibDir)$(TargetName).lib + MachineX86 + false @@ -143,7 +131,7 @@ Disabled - .;$(SolutionDir);$(SolutionDir)Externals\nvtt\include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\nvtt\include;%(AdditionalIncludeDirectories) FORCE_NO_EXCEPTIONS;WIN32;DEBUG;_WINDOWS;_USRDLL;DXT_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -160,8 +148,6 @@ $(IntDir) Level3 - true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -169,14 +155,12 @@ /MACHINE:I386 /NODEFAULTLIB:LIBCMT %(AdditionalOptions) - true - $(xrLibDir);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) - true false true - $(xrLibDir)$(TargetName).lib + MachineX86 + false @@ -194,7 +178,7 @@ Speed true true - .;$(SolutionDir);$(SolutionDir)Externals\nvtt\include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\nvtt\include;%(AdditionalIncludeDirectories) DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;DXT_EXPORTS;_SECURE_SCL=0;FORCE_NO_EXCEPTIONS;%(PreprocessorDefinitions) true @@ -210,8 +194,6 @@ $(IntDir) Level3 - true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -219,8 +201,6 @@ /MACHINE:I386 /NODEFAULTLIB:msvcp %(AdditionalOptions) - true - $(xrLibDir);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true false @@ -228,7 +208,6 @@ true true true - $(xrLibDir)$(TargetName).lib diff --git a/src/utils/xrLC/xrLC.vcxproj b/src/utils/xrLC/xrLC.vcxproj index 7fd1c636bde..87c8e7da433 100644 --- a/src/utils/xrLC/xrLC.vcxproj +++ b/src/utils/xrLC/xrLC.vcxproj @@ -16,25 +16,23 @@ {A4ABD75E-825B-4D09-B3B2-2709682E40C8} + 8.1 Application v140 - false false MultiByte Application v140 - false MultiByte Application v140 - false false MultiByte true @@ -62,18 +60,12 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -93,7 +85,7 @@ true true true - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;%(AdditionalIncludeDirectories) LEVEL_COMPILER;_USE_MATH_DEFINES;WIN32;_WINDOWS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -108,8 +100,6 @@ stdafx.h Level3 - true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -120,7 +110,6 @@ NotSet true $(DXSDK_DIR)Lib\x86;$(xrLibDir);$(xrSdkDir)libraries;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\MagicSoftware\Sdk\Library\ReleaseDLL;%(AdditionalLibraryDirectories) - true Windows true true @@ -128,7 +117,7 @@ UseLinkTimeCodeGeneration false $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 @@ -141,7 +130,7 @@ Disabled - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;%(AdditionalIncludeDirectories) LEVEL_COMPILER;FORCE_NO_EXCEPTIONS;_USE_MATH_DEFINES;WIN32;DEBUG;_WINDOWS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -154,8 +143,6 @@ stdafx.h Level3 - true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -165,13 +152,12 @@ /MACHINE:I386 %(AdditionalOptions) true $(DXSDK_DIR)Lib\x86;$(xrLibDir);$(xrSdkDir)libraries;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\MagicSoftware\Sdk\Library\DebugDLL;%(AdditionalLibraryDirectories) - true Windows 2097152 true false $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 @@ -190,7 +176,7 @@ Speed false true - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;%(AdditionalIncludeDirectories) LEVEL_COMPILER;_USE_MATH_DEFINES;WIN32;DEBUG;_WINDOWS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -203,8 +189,6 @@ stdafx.h Level3 - true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) diff --git a/src/utils/xrLCUtil/xrLCUtil.vcxproj b/src/utils/xrLCUtil/xrLCUtil.vcxproj index 9255d5ad1fd..7b7ea682e28 100644 --- a/src/utils/xrLCUtil/xrLCUtil.vcxproj +++ b/src/utils/xrLCUtil/xrLCUtil.vcxproj @@ -19,6 +19,7 @@ xrLCUtil Win32Proj xrLCUtil + 8.1 @@ -59,23 +60,16 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - + Disabled - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) LEVEL_COMPILER;FORCE_NO_EXCEPTIONS;_USE_MATH_DEFINES;WIN32;DEBUG;_WINDOWS;_USRDLL;XRLCUTIL_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true true @@ -85,7 +79,6 @@ Fast Use Level3 - EditAndContinue pch.hpp @@ -94,7 +87,6 @@ $(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\bin;%(AdditionalLibraryDirectories) - true Windows true false @@ -111,7 +103,7 @@ Speed true true - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) LEVEL_COMPILER;WIN32;NDEBUG;_WINDOWS;_USRDLL;XRLCUTIL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -119,7 +111,6 @@ Fast Use Level3 - ProgramDatabase pch.hpp @@ -128,7 +119,6 @@ $(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\bin;%(AdditionalLibraryDirectories) - true Windows true true @@ -141,7 +131,7 @@ Disabled - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) LEVEL_COMPILER;_USE_MATH_DEFINES;WIN32;DEBUG;_WINDOWS;_USRDLL;XRLCUTIL_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true true @@ -150,7 +140,6 @@ Fast Use Level3 - EditAndContinue pch.hpp diff --git a/src/utils/xrLC_Light/xrLC_Light.vcxproj b/src/utils/xrLC_Light/xrLC_Light.vcxproj index cee60bf6812..5eef12ce281 100644 --- a/src/utils/xrLC_Light/xrLC_Light.vcxproj +++ b/src/utils/xrLC_Light/xrLC_Light.vcxproj @@ -18,6 +18,7 @@ {EFB76D6F-0092-439C-A783-C0BE10BD17C9} xrLC_Light Win32Proj + 8.1 @@ -58,23 +59,16 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - + Disabled - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) LEVEL_COMPILER;FORCE_NO_EXCEPTIONS;_USE_MATH_DEFINES;WIN32;DEBUG;_WINDOWS;_USRDLL;XRLC_LIGHT_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true true @@ -84,11 +78,9 @@ Fast Use Level3 - EditAndContinue $(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\bin;%(AdditionalLibraryDirectories) - true Windows true false @@ -105,7 +97,7 @@ Speed true true - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) LEVEL_COMPILER;WIN32;NDEBUG;_WINDOWS;_USRDLL;XRLC_LIGHT_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -113,11 +105,9 @@ Fast Use Level3 - ProgramDatabase $(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\bin;%(AdditionalLibraryDirectories) - true Windows true true @@ -130,7 +120,7 @@ Disabled - $(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories) LEVEL_COMPILER;_USE_MATH_DEFINES;WIN32;DEBUG;_WINDOWS;_USRDLL;XRLC_LIGHT_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true true @@ -139,7 +129,6 @@ Fast Use Level3 - EditAndContinue $(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\bin;%(AdditionalLibraryDirectories) diff --git a/src/utils/xrLC_LightStab/xrLC_LightStab.vcxproj b/src/utils/xrLC_LightStab/xrLC_LightStab.vcxproj index 31e019189e9..365d25ae9dd 100644 --- a/src/utils/xrLC_LightStab/xrLC_LightStab.vcxproj +++ b/src/utils/xrLC_LightStab/xrLC_LightStab.vcxproj @@ -18,6 +18,7 @@ {EC924B9B-4991-4931-8623-E1DB9AE005CA} xrLC_LightStab Win32Proj + 8.1 @@ -58,24 +59,17 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true Disabled - $(SolutionDir);$(xrSdkDir)include;$(SolutionDir)xrQSlim\src;%(AdditionalIncludeDirectories) FORCE_NO_EXCEPTIONS;_USE_MATH_DEFINES;WIN32;_DEBUG;_WINDOWS;_USRDLL;XRLC_LIGHT_STAB_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true true @@ -85,11 +79,9 @@ Fast Use Level3 - EditAndContinue $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows true false @@ -99,19 +91,16 @@ - $(SolutionDir);$(xrSdkDir)include;$(SolutionDir)xrQSlim\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;XRLC_LIGHT_STAB_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL Fast Use Level3 - ProgramDatabase StreamingSIMDExtensions2 $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows true true @@ -123,7 +112,6 @@ Disabled - $(SolutionDir);$(xrSdkDir)include;$(xrSdkDir)include;$(SolutionDir)xrQSlim\src;%(AdditionalIncludeDirectories) _USE_MATH_DEFINES;WIN32;_DEBUG;_WINDOWS;_USRDLL;XRLC_LIGHT_STAB_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true true @@ -132,7 +120,6 @@ Fast Use Level3 - EditAndContinue $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) diff --git a/src/utils/xrQSlim/xrQSlim.vcxproj b/src/utils/xrQSlim/xrQSlim.vcxproj index d48207f80c0..4658bd7ec97 100644 --- a/src/utils/xrQSlim/xrQSlim.vcxproj +++ b/src/utils/xrQSlim/xrQSlim.vcxproj @@ -18,6 +18,7 @@ {F1836CE2-59EF-4189-8B9C-D103A511CB27} xrQSlim Win32Proj + 8.1 @@ -57,23 +58,13 @@ <_ProjectFileVersion>12.0.30501.0 - - $(xrLibDir) - $(xrIntDir)$(ProjectName)\ - - - $(xrLibDir) - $(xrIntDir)$(ProjectName)\ - - - $(xrLibDir) - $(xrIntDir)$(ProjectName)\ - + + + Disabled true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;XR_QSLIM_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -83,7 +74,6 @@ true Use Level4 - ProgramDatabase @@ -95,7 +85,6 @@ true true true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;XR_QSLIM_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -108,7 +97,6 @@ true Use Level3 - ProgramDatabase @@ -119,7 +107,6 @@ Speed true true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;DEBUG;XR_QSLIM_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -129,7 +116,6 @@ true Use Level3 - ProgramDatabase diff --git a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj index 34eec1f08e5..ed073fa0714 100644 --- a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj +++ b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj @@ -18,6 +18,7 @@ {3AD26FD3-4F52-4E22-A4CF-AD4C49E74C61} xrSE_Factory Win32Proj + 8.1 @@ -60,26 +61,20 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false Disabled false - .;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;_USRDLL;XRSE_FACTORY_EXPORTS;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions) false false @@ -95,17 +90,14 @@ Use stdafx.h Level4 - ProgramDatabase /MACHINE:I386 %(AdditionalOptions) true - $(SolutionDir)Externals\bugtrap\Bin;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true + $(SolutionDir)Externals\bugtrap\Bin;%(AdditionalLibraryDirectories) Windows true false - $(xrLibDir)$(TargetName).lib MachineX86 @@ -124,7 +116,7 @@ Speed false true - .;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;%(AdditionalIncludeDirectories) DEBUG;MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRSE_FACTORY_EXPORTS;dSINGLE;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions) true false @@ -141,7 +133,6 @@ Level4 true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -150,11 +141,8 @@ /MACHINE:I386 %(AdditionalOptions) true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true true false - $(xrLibDir)$(TargetName).lib MachineX86 @@ -167,7 +155,7 @@ true true true - .;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -181,18 +169,14 @@ Use stdafx.h Level4 - ProgramDatabase - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows true true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib MachineX86 diff --git a/src/xrAICore/xrAICore.vcxproj b/src/xrAICore/xrAICore.vcxproj index 861cd6ea9be..161c619d090 100644 --- a/src/xrAICore/xrAICore.vcxproj +++ b/src/xrAICore/xrAICore.vcxproj @@ -17,24 +17,22 @@ {5CB057D8-4464-40A6-AF10-C26B826D1D90} xrAICore + 8.1 DynamicLibrary v140 - false MultiByte DynamicLibrary v140 - false MultiByte DynamicLibrary v140 - false MultiByte true @@ -61,18 +59,12 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true @@ -92,7 +84,6 @@ true true true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;XRAICORE_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -108,7 +99,6 @@ Level4 true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -117,17 +107,13 @@ /MACHINE:I386 %(AdditionalOptions) true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true - NotSet - false + Windows true true UseLinkTimeCodeGeneration false - - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 + true @@ -145,7 +131,6 @@ Speed false true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRAICORE_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -164,14 +149,11 @@ 0x0409 - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows - false + true false - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 @@ -187,7 +169,6 @@ false Neither true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;_USRDLL;XRAICORE_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) false true @@ -204,7 +185,6 @@ Level4 true - OldStyle _DEBUG;%(PreprocessorDefinitions) @@ -213,14 +193,11 @@ /MACHINE:I386 %(AdditionalOptions) true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true false - false false - - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 + true + Windows diff --git a/src/xrCDB/xrCDB.vcxproj b/src/xrCDB/xrCDB.vcxproj index babbb49e42b..8e478aa73fc 100644 --- a/src/xrCDB/xrCDB.vcxproj +++ b/src/xrCDB/xrCDB.vcxproj @@ -17,24 +17,22 @@ {A19B1DF2-82EC-4364-8BDF-85D13A1C89B5} xrCDB + 8.1 DynamicLibrary v140 - false MultiByte DynamicLibrary v140 - false MultiByte DynamicLibrary v140 - false MultiByte true @@ -61,18 +59,12 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true @@ -92,7 +84,6 @@ true true true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;XRCDB_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -108,7 +99,6 @@ Level4 true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -117,17 +107,13 @@ /MACHINE:I386 %(AdditionalOptions) true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true - NotSet - false + Windows true true UseLinkTimeCodeGeneration false - - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 + true @@ -145,7 +131,6 @@ Speed false true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRCDB_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -164,14 +149,11 @@ 0x0409 - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows - false + true false - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 @@ -187,7 +169,6 @@ false Neither true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;_USRDLL;XRCDB_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) false true @@ -204,7 +185,6 @@ Level4 true - OldStyle _DEBUG;%(PreprocessorDefinitions) @@ -213,14 +193,11 @@ /MACHINE:I386 %(AdditionalOptions) true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true false - false false - - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 + true + Windows diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj index 976b5f86b70..79036288a04 100644 --- a/src/xrCore/xrCore.vcxproj +++ b/src/xrCore/xrCore.vcxproj @@ -18,6 +18,7 @@ {A0F7D1FB-59A7-4717-A7E4-96F37E91998E} xrCore Win32Proj + 8.1 @@ -59,24 +60,18 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false Disabled - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals;$(xrSdkDir)include;$(SolutionDir)Externals\openssl\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals;$(SolutionDir)Externals\openssl\include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;_USRDLL;XRCORE_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions);CRYPTO_BUILD false true @@ -92,20 +87,16 @@ Level4 true - ProgramDatabase true - $(xrSdkDir)libraries;$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);$(SolutionDir)Externals\openssl\lib;%(AdditionalLibraryDirectories) - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;$(SolutionDir)Externals\openssl\lib;%(AdditionalLibraryDirectories) false Windows - true false - - $(xrLibDir)$(TargetName).lib MachineX86 xrAPI.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + true @@ -117,7 +108,7 @@ true true true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals;$(xrSdkDir)include;$(SolutionDir)Externals\openssl\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals;$(SolutionDir)Externals\openssl\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;XRCORE_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions);CRYPTO_BUILD true @@ -131,21 +122,17 @@ Use Level4 - ProgramDatabase - $(xrSdkDir)libraries;$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);$(SolutionDir)Externals\openssl\lib;%(AdditionalLibraryDirectories) - true - NotSet - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;$(SolutionDir)Externals\openssl\lib;%(AdditionalLibraryDirectories) + Windows true true UseLinkTimeCodeGeneration false - - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 xrAPI.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + true @@ -156,7 +143,7 @@ Speed false true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals;$(xrSdkDir)include;$(SolutionDir)Externals\openssl\include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals;$(SolutionDir)Externals\openssl\include;%(AdditionalIncludeDirectories) MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRCORE_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions);CRYPTO_BUILD true MultiThreadedDLL @@ -171,14 +158,12 @@ ProgramDatabase - $(xrSdkDir)libraries;$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;$(xrLibDir);$(SolutionDir)Externals\openssl\lib;%(AdditionalLibraryDirectories) - true + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\BugTrap\Bin;$(SolutionDir)Externals\openssl\lib;%(AdditionalLibraryDirectories) Windows true false - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 xrAPI.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) diff --git a/src/xrD3D9-Null/xrD3D9-Null.vcxproj b/src/xrD3D9-Null/xrD3D9-Null.vcxproj index 79c89ea7fca..3827f27f93f 100644 --- a/src/xrD3D9-Null/xrD3D9-Null.vcxproj +++ b/src/xrD3D9-Null/xrD3D9-Null.vcxproj @@ -13,6 +13,7 @@ {0899B131-F1D4-4876-9BA1-67AC821DB9E1} Win32Proj + 8.1 @@ -43,14 +44,8 @@ <_ProjectFileVersion>12.0.30501.0 - - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - *.idb%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath) - + - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -64,17 +59,13 @@ false Use Level3 - EditAndContinue - $(SolutionDir);%(AdditionalIncludeDirectories) xrD3D9-Null.def - true Windows true false - $(xrLibDir)$(TargetName).lib MachineX86 @@ -97,12 +88,9 @@ false Use Level3 - ProgramDatabase - $(SolutionDir);%(AdditionalIncludeDirectories) xrD3D9-Null.def - true Windows true true @@ -110,7 +98,6 @@ UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib MachineX86 diff --git a/src/xrEngine/xrEngine.vcxproj b/src/xrEngine/xrEngine.vcxproj index 30429198d40..d5120505004 100644 --- a/src/xrEngine/xrEngine.vcxproj +++ b/src/xrEngine/xrEngine.vcxproj @@ -29,44 +29,39 @@ {2578C6D8-660D-48AE-9322-7422F8664F06} xrEngine + 8.11 Application v140 - false MultiByte true Application v140 - false MultiByte Application v140 - false MultiByte Application v140 - false MultiByte true Application v140 - false MultiByte Application v140 - false MultiByte @@ -107,37 +102,29 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - *.idb%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath) true true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir)dedicated\ - $(xrIntDir)$(ProjectName)\ - *.idb%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath) + $(xrBinDir)dedicated true true + $(xrIntDir)$(ProjectName)_dedicated - $(xrBinDir)dedicated\ - $(xrIntDir)$(ProjectName)\ + $(xrBinDir)dedicated true + $(xrIntDir)$(ProjectName)_dedicated - $(xrBinDir)dedicated\ - $(xrIntDir)$(ProjectName)\ + $(xrBinDir)dedicated + $(xrIntDir)$(ProjectName)_dedicated false @@ -147,7 +134,7 @@ false Neither true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(xrSdkDir)include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;INGAME_EDITOR;DEBUG;WIN32;_WINDOWS;ENGINE_BUILD;_SECURE_SCL=0;%(PreprocessorDefinitions) false true @@ -164,8 +151,6 @@ stdafx.h Level4 - true - ProgramDatabase Default @@ -175,18 +160,15 @@ /ignore:4099 /MACHINE:I386 %(AdditionalOptions) lua51.lib;luabind.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies) - NotSet - true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Debug;$(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) - true false Windows - true false - $(xrLibDir)$(TargetName).lib + true + MachineX86 as-invoker-manifest-part.xml;%(AdditionalManifestFiles) @@ -200,7 +182,7 @@ Speed false true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(xrSdkDir)include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;INGAME_EDITOR;DEBUG;MIXED;WIN32;_WINDOWS;ENGINE_BUILD;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -212,7 +194,6 @@ Use stdafx.h Level4 - true ProgramDatabase @@ -222,16 +203,12 @@ /MACHINE:I386 %(AdditionalOptions) lua51.lib;luabind.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies) - true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;$(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;$(xrLibRootDir)Mixed;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) - true Windows true false - false - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 as-invoker-manifest-part.xml;%(AdditionalManifestFiles) @@ -246,7 +223,7 @@ true true true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(xrSdkDir)include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;NDEBUG;WIN32;_WINDOWS;ENGINE_BUILD;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -261,8 +238,6 @@ stdafx.h Level4 - true - ProgramDatabase Default @@ -272,18 +247,15 @@ /MACHINE:I386 %(AdditionalOptions) lua51.lib;luabind.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies) - true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;$(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) - true - NotSet - true + Windows true true UseLinkTimeCodeGeneration false - false - $(xrLibDir)$(TargetName).lib + true + MachineX86 as-invoker-manifest-part.xml;%(AdditionalManifestFiles) @@ -296,7 +268,7 @@ false Neither true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(xrSdkDir)include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;DEDICATED_SERVER;DEBUG;WIN32;ENGINE_BUILD;_SECURE_SCL=0;%(PreprocessorDefinitions) false true @@ -313,7 +285,6 @@ stdafx.h Level4 - true ProgramDatabase Default @@ -324,18 +295,13 @@ /MACHINE:I386 %(AdditionalOptions) lua51.lib;luabind.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies) - NotSet - $(OutDir)$(TargetName).exe - true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Debug;$(xrSdkDir)libraries;$(xrLibRootDir)Debug;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Debug;$(xrLibRootDir)Debug;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) - true false Windows true false - false - + MachineX86 as-invoker-manifest-part.xml;%(AdditionalManifestFiles) @@ -349,7 +315,7 @@ Speed false true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(xrSdkDir)include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;DEDICATED_SERVER;DEBUG;MIXED;WIN32;_WINDOWS;ENGINE_BUILD;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -362,7 +328,6 @@ stdafx.h Level4 - true ProgramDatabase @@ -372,16 +337,12 @@ /MACHINE:I386 %(AdditionalOptions) lua51.lib;luabind.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName).exe - true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;$(xrSdkDir)libraries;$(xrLibRootDir)Mixed;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;$(xrLibRootDir)Mixed;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) - true Windows true false - false - + MachineX86 as-invoker-manifest-part.xml;%(AdditionalManifestFiles) @@ -395,7 +356,7 @@ Speed true true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(xrSdkDir)include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\libtheora-1.1.1\include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;DEDICATED_SERVER;NDEBUG;WIN32;_WINDOWS;ENGINE_BUILD;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -408,7 +369,6 @@ stdafx.h Level4 - true ProgramDatabase Default StreamingSIMDExtensions2 @@ -420,18 +380,14 @@ /MACHINE:I386 %(AdditionalOptions) lua51.lib;luabind.lib;vfw32.lib;libogg_static.lib;libtheora_static.lib;oalib.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName).exe - true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;$(xrSdkDir)libraries;$(xrLibRootDir)Release;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libtheora-1.1.1\win32\lib\$(Platform)\Release;$(xrLibRootDir)Release;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) - true - NotSet + Windows true true true false - false - + MachineX86 as-invoker-manifest-part.xml;%(AdditionalManifestFiles) diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj index e81e3bc2134..b0e617fa7fa 100644 --- a/src/xrGame/xrGame.vcxproj +++ b/src/xrGame/xrGame.vcxproj @@ -17,25 +17,23 @@ {200652A6-043E-4634-8837-87983B3BD5E0} xrGame + 8.11 DynamicLibrary v140 - false MultiByte true DynamicLibrary v140 - false MultiByte DynamicLibrary v140 - false MultiByte @@ -61,20 +59,13 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - *.idb%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath) true true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -90,7 +81,7 @@ false Neither true - .;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;WIN32;DEBUG;_WINDOWS;_USRDLL;XRGAME_EXPORTS;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions) false false @@ -107,8 +98,6 @@ stdafx.h Level4 - true - ProgramDatabase 4237;4250;%(DisableSpecificWarnings) true @@ -120,14 +109,13 @@ /MACHINE:I386 /ignore:4075 %(AdditionalOptions) NotSet - true - $(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\jpeg\libraries\Release;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true + $(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\jpeg\libraries\Release;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) false - true false - $(xrLibDir)$(TargetName).lib lua51.lib;luabind.lib;%(AdditionalDependencies) + true + MachineX86 + Windows @@ -145,7 +133,7 @@ Speed false true - .;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;DEBUG;MIXED;WIN32;_WINDOWS;_USRDLL;XRGAME_EXPORTS;dSINGLE;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -158,8 +146,6 @@ stdafx.h Level4 - true - ProgramDatabase 4237;4250;%(DisableSpecificWarnings) true @@ -169,14 +155,13 @@ /MACHINE:I386 %(AdditionalOptions) - true - $(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\jpeg\libraries\Release;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true + $(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\jpeg\libraries\Release;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) true false $(xrLibDir)$(TargetName).lib MachineX86 lua51.lib;luabind.lib;%(AdditionalDependencies) + Windows @@ -195,7 +180,7 @@ true true false - .;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) LUABIND_DYNAMIC_LINK;WIN32;NDEBUG;_WINDOWS;_USRDLL;XRGAME_EXPORTS;dSINGLE;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -211,8 +196,6 @@ stdafx.h Level4 - true - ProgramDatabase 4237;4250;%(DisableSpecificWarnings) true @@ -222,17 +205,15 @@ /MACHINE:I386 %(AdditionalOptions) - true - $(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\jpeg\libraries\Release;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) - true - NotSet - true + $(SolutionDir)Externals\OpenAutomate\libraries;$(SolutionDir)Externals\jpeg\libraries\Release;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + Windows true true false - $(xrLibDir)$(TargetName).lib lua51.lib;luabind.lib;%(AdditionalDependencies) + true + MachineX86 diff --git a/src/xrGameSpy/xrGameSpy.vcxproj b/src/xrGameSpy/xrGameSpy.vcxproj index 9cf46445a6e..78f73606d46 100644 --- a/src/xrGameSpy/xrGameSpy.vcxproj +++ b/src/xrGameSpy/xrGameSpy.vcxproj @@ -14,6 +14,7 @@ {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7} xrGameSpy Win32Proj + 8.11 @@ -45,19 +46,14 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false Disabled - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;_USRDLL;XRGAMESPY_EXPORTS;_SECURE_SCL=0;XRAY_DISABLE_GAMESPY_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -67,17 +63,13 @@ false Use Level3 - ProgramDatabase 4996;%(DisableSpecificWarnings) - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows - true false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -89,7 +81,6 @@ true true true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;XRGAMESPY_EXPORTS;_SECURE_SCL=0;XRAY_DISABLE_GAMESPY_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -100,20 +91,16 @@ false Use Level3 - ProgramDatabase 4996;%(DisableSpecificWarnings) - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows - true true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib MachineX86 + true diff --git a/src/xrNetServer/xrNetServer.vcxproj b/src/xrNetServer/xrNetServer.vcxproj index 7a2034758a5..8572ace84bf 100644 --- a/src/xrNetServer/xrNetServer.vcxproj +++ b/src/xrNetServer/xrNetServer.vcxproj @@ -16,22 +16,22 @@ {435BAC9A-B225-457D-AB40-C9BD0CC8838C} + 8.11 DynamicLibrary v140 - false + MultiByte DynamicLibrary v140 - false + MultiByte DynamicLibrary v140 - false MultiByte true @@ -58,19 +58,12 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - *.idb%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath) true @@ -89,7 +82,7 @@ true true true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;XR_NETSERVER_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -102,8 +95,6 @@ true Use Level4 - true - ProgramDatabase CompileAsCpp @@ -115,14 +106,13 @@ Ws2_32.lib;%(AdditionalDependencies) true $(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true - NotSet - true + Windows true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib + true + MachineX86 @@ -139,7 +129,7 @@ Speed false true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) MIXED;WIN32;DEBUG;_WINDOWS;XR_NETSERVER_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -150,7 +140,6 @@ true Use Level4 - true ProgramDatabase CompileAsCpp @@ -162,13 +151,13 @@ Ws2_32.lib;%(AdditionalDependencies) true $(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows true false $(xrLibDir)$(TargetName).lib + MachineX86 @@ -182,7 +171,7 @@ Disabled true - .;$(SolutionDir);$(DXSDK_DIR)Include;$(xrSdkDir)include;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) DEBUG;WIN32;_WINDOWS;XR_NETSERVER_EXPORTS;%(PreprocessorDefinitions) false true @@ -195,8 +184,6 @@ true Use Level4 - true - ProgramDatabase CompileAsCpp @@ -208,11 +195,10 @@ Ws2_32.lib;%(AdditionalDependencies) true $(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows - true false - $(xrLibDir)$(TargetName).lib + true + MachineX86 diff --git a/src/xrParticles/xrParticles.vcxproj b/src/xrParticles/xrParticles.vcxproj index 552839c42a7..38bbe4851e6 100644 --- a/src/xrParticles/xrParticles.vcxproj +++ b/src/xrParticles/xrParticles.vcxproj @@ -17,22 +17,22 @@ {94A1C366-3D19-48E6-8170-4ADC2E70DF97} xrParticles + 8.11 DynamicLibrary v140 - false + MultiByte DynamicLibrary v140 - false + MultiByte DynamicLibrary v140 - false MultiByte true @@ -59,18 +59,12 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true @@ -89,7 +83,6 @@ true true true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;XR_PARTICLES_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -102,8 +95,6 @@ true Use Level4 - true - ProgramDatabase CompileAsCpp @@ -112,16 +103,13 @@ /MACHINE:I386 %(AdditionalOptions) - true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true - NotSet - true + Windows true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib + true + MachineX86 @@ -138,7 +126,6 @@ Speed false true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) MIXED;WIN32;DEBUG;_WINDOWS;XR_PARTICLES_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -149,7 +136,6 @@ true Use Level4 - true ProgramDatabase @@ -157,13 +143,11 @@ /MACHINE:I386 %(AdditionalOptions) - true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows true false $(xrLibDir)$(TargetName).lib + MachineX86 @@ -177,7 +161,6 @@ Disabled true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) DEBUG;WIN32;_WINDOWS;XR_PARTICLES_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) false true @@ -190,8 +173,6 @@ true Use Level4 - true - ProgramDatabase CompileAsCpp @@ -200,13 +181,10 @@ /MACHINE:I386 %(AdditionalOptions) - true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows - true false - $(xrLibDir)$(TargetName).lib + true + MachineX86 diff --git a/src/xrPhysics/xrPhysics.vcxproj b/src/xrPhysics/xrPhysics.vcxproj index cb4df0893fd..a473eb7de6a 100644 --- a/src/xrPhysics/xrPhysics.vcxproj +++ b/src/xrPhysics/xrPhysics.vcxproj @@ -17,6 +17,7 @@ {98D24A3D-7666-4C11-9D6E-B10393CE8CBA} Win32Proj + 8.11 @@ -58,19 +59,13 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -79,7 +74,6 @@ false Neither true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;dSINGLE;_USRDLL;XRPHYSICS_EXPORTS;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions) false true @@ -95,19 +89,15 @@ Level4 true - ProgramDatabase /NODEFAULTLIB:LIBCMTD %(AdditionalOptions) true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true false Windows - true false - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 + true @@ -119,7 +109,6 @@ true true true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;dSINGLE;_USRDLL;XRPHYSICS_EXPORTS;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -133,19 +122,15 @@ Use Level4 - ProgramDatabase - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true - NotSet - true + Windows true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -156,7 +141,6 @@ Speed false true - $(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories) MIXED;WIN32;DEBUG;_WINDOWS;dSINGLE;_USRDLL;XRPHYSICS_EXPORTS;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,13 +156,11 @@ libvorbisfile_static.lib;libogg_static.lib;OpenAL32.lib;%(AdditionalDependencies) - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows true false $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 diff --git a/src/xrScriptEngine/xrScriptEngine.vcxproj b/src/xrScriptEngine/xrScriptEngine.vcxproj index 257ad81e36d..5e608db3b6a 100644 --- a/src/xrScriptEngine/xrScriptEngine.vcxproj +++ b/src/xrScriptEngine/xrScriptEngine.vcxproj @@ -17,24 +17,22 @@ {132C62DE-DE85-4978-9675-C78ED4DA46F0} xrScriptEngine + 8.11 DynamicLibrary v140 - false MultiByte DynamicLibrary v140 - false MultiByte DynamicLibrary v140 - false MultiByte true @@ -61,18 +59,12 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true @@ -92,7 +84,7 @@ true true true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;XRSCRIPTENGINE_EXPORTS;LUABIND_DYNAMIC_LINK;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -108,7 +100,6 @@ Level4 true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -117,18 +108,15 @@ /MACHINE:I386 %(AdditionalOptions) true - $(SolutionDir)Externals\luajit\bin\$(PlatformShortName);$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true - NotSet - false + $(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) + Windows true true UseLinkTimeCodeGeneration false - - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 lua51.lib;luabind.lib;%(AdditionalDependencies) + true @@ -146,7 +134,7 @@ Speed false true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) WIN32;DEBUG;MIXED;_WINDOWS;_USRDLL;XRSCRIPTENGINE_EXPORTS;LUABIND_DYNAMIC_LINK;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -165,14 +153,12 @@ 0x0409 - $(SolutionDir)Externals\luajit\bin\$(PlatformShortName);$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true + $(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) Windows - false + true false - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 lua51.lib;luabind.lib;%(AdditionalDependencies) @@ -189,7 +175,7 @@ false Neither true - .;$(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;_USRDLL;XRSCRIPTENGINE_EXPORTS;LUABIND_DYNAMIC_LINK;_SECURE_SCL=0;%(PreprocessorDefinitions) false true @@ -206,7 +192,6 @@ Level4 true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -215,15 +200,13 @@ /MACHINE:I386 %(AdditionalOptions) true - $(SolutionDir)Externals\luajit\bin\$(PlatformShortName);$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true + $(SolutionDir)Externals\luajit\bin\$(PlatformShortName);%(AdditionalLibraryDirectories) false - false false - - $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 lua51.lib;luabind.lib;%(AdditionalDependencies) + true + Windows @@ -235,6 +218,9 @@ {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} false + + {ccd4afae-aa10-42c6-a452-fdee497ccdf1} + diff --git a/src/xrSound/xrSound.vcxproj b/src/xrSound/xrSound.vcxproj index c045df876d5..cb353d0af59 100644 --- a/src/xrSound/xrSound.vcxproj +++ b/src/xrSound/xrSound.vcxproj @@ -17,6 +17,7 @@ {CCCA7859-EB86-493E-9B53-C4235F45B3C5} Win32Proj + 8.11 @@ -58,19 +59,13 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false @@ -79,7 +74,7 @@ false Neither true - $(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\OpenAL\include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\OpenAL\include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;_USRDLL;XRSOUND_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) false true @@ -94,21 +89,17 @@ Use Level4 - true - ProgramDatabase /NODEFAULTLIB:LIBCMTD %(AdditionalOptions) libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;%(AdditionalDependencies) true - $(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Debug;%(AdditionalLibraryDirectories) - true + $(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Debug;%(AdditionalLibraryDirectories) false Windows - true false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -120,7 +111,7 @@ true true true - $(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\OpenAL\include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\OpenAL\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;XRSOUND_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -134,20 +125,17 @@ Use Level4 - ProgramDatabase libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;%(AdditionalDependencies) - $(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - NotSet - true + $(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories) + Windows true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib MachineX86 + true @@ -158,7 +146,7 @@ Speed false true - $(SolutionDir);$(xrSdkDir)include;$(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\OpenAL\include;%(AdditionalIncludeDirectories) + $(SolutionDir)Externals\libvorbis-1.2.3\include;$(SolutionDir)Externals\libogg-1.1.4\include;$(SolutionDir)Externals\OpenAL\include;%(AdditionalIncludeDirectories) MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRSOUND_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,17 +158,15 @@ Use Level4 - ProgramDatabase libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;%(AdditionalDependencies) - $(xrSdkDir)libraries;$(xrLibDir);$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories) - true + $(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories) Windows true false $(xrLibDir)$(TargetName).lib - NotSet + MachineX86 diff --git a/src/xrXMLParser/xrXMLParser.vcxproj b/src/xrXMLParser/xrXMLParser.vcxproj index 4fcd71a5535..d994c2059e9 100644 --- a/src/xrXMLParser/xrXMLParser.vcxproj +++ b/src/xrXMLParser/xrXMLParser.vcxproj @@ -16,23 +16,22 @@ {94A1C366-3D19-48E6-8170-4ADC2E70DF98} + 8.1 DynamicLibrary v140 - false + MultiByte DynamicLibrary v140 - false MultiByte DynamicLibrary v140 - false MultiByte true @@ -59,18 +58,12 @@ <_ProjectFileVersion>12.0.30501.0 - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ false - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ true true @@ -105,7 +98,6 @@ Use Level4 true - ProgramDatabase CompileAsCpp @@ -114,16 +106,13 @@ /MACHINE:I386 %(AdditionalOptions) - true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true - NotSet - true + Windows true true UseLinkTimeCodeGeneration false - $(xrLibDir)$(TargetName).lib + true + MachineX86 @@ -162,13 +151,11 @@ /MACHINE:I386 %(AdditionalOptions) - true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows true false $(xrLibDir)$(TargetName).lib + MachineX86 @@ -197,7 +184,6 @@ Use Level4 true - ProgramDatabase CompileAsCpp @@ -206,13 +192,10 @@ /MACHINE:I386 %(AdditionalOptions) - true - $(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories) - true Windows - true false - $(xrLibDir)$(TargetName).lib + true + MachineX86