diff --git a/sdk/include/lua/library_linkage.h b/sdk/include/lua/library_linkage.h deleted file mode 100644 index dbbdb1e63..000000000 --- a/sdk/include/lua/library_linkage.h +++ /dev/null @@ -1,14 +0,0 @@ -//////////////////////////////////////////////////////////////////////////// -// Module : library_linkage.h -// Created : 14.04.2007 -// Modified : 23.04.2008 -// Author : Dmitriy Iassenev -// Description : library linkage file -//////////////////////////////////////////////////////////////////////////// - -#ifndef LUA_LIBRARY_LINKAGE_H_INCLUDED -#define LUA_LIBRARY_LINKAGE_H_INCLUDED - -#pragma comment(lib, "lua.JIT.1.1.4.lib" ) - -#endif // #ifndef LUA_LIBRARY_LINKAGE_H_INCLUDED \ No newline at end of file diff --git a/sdk/include/luabind/library_linkage.h b/sdk/include/luabind/library_linkage.h deleted file mode 100644 index 0b2cf17d2..000000000 --- a/sdk/include/luabind/library_linkage.h +++ /dev/null @@ -1,14 +0,0 @@ -//////////////////////////////////////////////////////////////////////////// -// Module : library_linkage.h -// Created : 14.04.2007 -// Modified : 23.04.2008 -// Author : Dmitriy Iassenev -// Description : library linkage file -//////////////////////////////////////////////////////////////////////////// - -#ifndef LUABIND_LIBRARY_LINKAGE_H_INCLUDED -#define LUABIND_LIBRARY_LINKAGE_H_INCLUDED - -#pragma comment(lib, "luabind.beta7-devel.rc4.lib" ) - -#endif // #ifndef LUABIND_LIBRARY_LINKAGE_H_INCLUDED \ No newline at end of file diff --git a/src/3rd party/luabind/luabind.beta7-devel.rc4.vcxproj b/src/3rd party/luabind/luabind.beta7-devel.rc4.vcxproj index 2c6caef76..36d1433c9 100644 --- a/src/3rd party/luabind/luabind.beta7-devel.rc4.vcxproj +++ b/src/3rd party/luabind/luabind.beta7-devel.rc4.vcxproj @@ -55,20 +55,20 @@ - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false ..\..\..\sdk\include;..\..\include;$(IncludePath) - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false ..\..\..\sdk\include;..\..\include;$(IncludePath) - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false ..\..\..\sdk\include;..\..\include;$(IncludePath) @@ -100,7 +100,6 @@ $(OutDir)$(ProjectName).dll - $(SolutionDir)lib;%(AdditionalLibraryDirectories) true false Windows @@ -108,9 +107,8 @@ true false - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 - lua.JIT.1.1.4.lib;%(AdditionalDependencies) @@ -140,7 +138,6 @@ $(OutDir)$(ProjectName).dll - $(SolutionDir)lib;%(AdditionalLibraryDirectories) true false Windows @@ -149,9 +146,8 @@ false - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 - lua.JIT.1.1.4.lib;%(AdditionalDependencies) @@ -178,15 +174,13 @@ $(OutDir)$(ProjectName).dll - $(SolutionDir)lib;%(AdditionalLibraryDirectories) true false Windows false - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 - lua.JIT.1.1.4.lib;%(AdditionalDependencies) @@ -445,7 +439,6 @@ {f6c4f74a-152c-4612-9e3b-d02346234855} - false diff --git a/src/3rd party/luajit/lua.JIT.1.1.4.vcxproj b/src/3rd party/luajit/lua.JIT.1.1.4.vcxproj index 149a9b631..efa98626a 100644 --- a/src/3rd party/luajit/lua.JIT.1.1.4.vcxproj +++ b/src/3rd party/luajit/lua.JIT.1.1.4.vcxproj @@ -55,20 +55,20 @@ - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false ..\..\..\sdk\include;..\..\include;dynasm;$(IncludePath) - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false ..\..\..\sdk\include;..\..\include;dynasm;$(IncludePath) - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false ..\..\..\sdk\include;..\..\include;dynasm;$(IncludePath) @@ -103,7 +103,7 @@ true false - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib;%(AdditionalLibraryDirectories) @@ -141,7 +141,7 @@ false - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib;%(AdditionalLibraryDirectories) @@ -172,7 +172,7 @@ Windows false - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib;%(AdditionalLibraryDirectories) diff --git a/src/ETools/ETools.vcxproj b/src/ETools/ETools.vcxproj index 589e7cea9..ce9890526 100644 --- a/src/ETools/ETools.vcxproj +++ b/src/ETools/ETools.vcxproj @@ -61,19 +61,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ - true + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -123,7 +122,6 @@ /MACHINE:I386 %(AdditionalOptions) %(AdditionalDependencies) - false user32.lib;%(IgnoreSpecificDefaultLibraries) true $(OutDir)$(ProjectName).pdb @@ -133,7 +131,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -180,14 +178,13 @@ /MACHINE:I386 /NODEFAULTLIB:LIBCMTD %(AdditionalOptions) %(AdditionalDependencies) - true user32.lib;%(IgnoreSpecificDefaultLibraries) true false Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -236,7 +233,6 @@ /MACHINE:I386 /NODEFAULTLIB:user32 %(AdditionalOptions) %(AdditionalDependencies) - true user32.dll;%(IgnoreSpecificDefaultLibraries) true false @@ -245,7 +241,7 @@ true true true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false diff --git a/src/LWO/LWO.vcxproj b/src/LWO/LWO.vcxproj index a91797b78..722c5ac39 100644 --- a/src/LWO/LWO.vcxproj +++ b/src/LWO/LWO.vcxproj @@ -60,18 +60,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true @@ -110,7 +110,7 @@ $(OutDir)$(ProjectName).dll true $(OutDir)$(ProjectName).pdb - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false @@ -149,7 +149,7 @@ $(OutDir)$(ProjectName).dll true $(OutDir)$(ProjectName).pdb - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false @@ -189,7 +189,7 @@ $(OutDir)$(ProjectName).dll true true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false diff --git a/src/xrAI/xrAI.vcxproj b/src/xrAI/xrAI.vcxproj index 92fa7a1c2..a59f7e7ca 100644 --- a/src/xrAI/xrAI.vcxproj +++ b/src/xrAI/xrAI.vcxproj @@ -61,18 +61,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -124,7 +124,7 @@ 0 0 true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;$(SolutionDir)sdk\MagicSoftware\FreeMagic\Library\ReleaseDLL\;%(AdditionalLibraryDirectories) false @@ -187,7 +187,7 @@ 0 true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;$(SolutionDir)sdk\MagicSoftware\FreeMagic\Library\ReleaseDLL\;%(AdditionalLibraryDirectories) false @@ -247,7 +247,7 @@ 0 true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;$(SolutionDir)sdk\MagicSoftware\FreeMagic\Library\ReleaseDLL\;%(AdditionalLibraryDirectories) false diff --git a/src/xrCDB/xrCDB.vcxproj b/src/xrCDB/xrCDB.vcxproj index 6b89d12be..56ade1fd8 100644 --- a/src/xrCDB/xrCDB.vcxproj +++ b/src/xrCDB/xrCDB.vcxproj @@ -61,18 +61,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true @@ -132,7 +132,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -184,7 +184,7 @@ $(OutDir)$(ProjectName).map Windows false - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -240,7 +240,7 @@ false false - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false diff --git a/src/xrCompress/xrCompress.vcxproj b/src/xrCompress/xrCompress.vcxproj index d9b1d1805..bdd7cc259 100644 --- a/src/xrCompress/xrCompress.vcxproj +++ b/src/xrCompress/xrCompress.vcxproj @@ -62,18 +62,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ @@ -125,7 +125,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false @@ -173,7 +173,7 @@ Console true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false @@ -221,7 +221,7 @@ $(OutDir)$(ProjectName).map Console true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj index 224f7b940..96a1fab80 100644 --- a/src/xrCore/xrCore.vcxproj +++ b/src/xrCore/xrCore.vcxproj @@ -60,18 +60,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true @@ -113,7 +113,7 @@ false Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 %(AdditionalLibraryDirectories) false @@ -161,7 +161,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 %(AdditionalLibraryDirectories) false @@ -203,7 +203,7 @@ $(OutDir)$(ProjectName).map Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 %(AdditionalLibraryDirectories) false diff --git a/src/xrCore/xrCoreStatic.vcxproj b/src/xrCore/xrCoreStatic.vcxproj index 807ea0cb9..a5c655b1c 100644 --- a/src/xrCore/xrCoreStatic.vcxproj +++ b/src/xrCore/xrCoreStatic.vcxproj @@ -60,16 +60,16 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)lib\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)lib\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ - $(SolutionDir)lib\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)lib\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ - $(SolutionDir)lib\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)lib\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ diff --git a/src/xrDXT/DXT.vcxproj b/src/xrDXT/DXT.vcxproj index cb4bd0dee..e78586295 100644 --- a/src/xrDXT/DXT.vcxproj +++ b/src/xrDXT/DXT.vcxproj @@ -64,18 +64,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -124,7 +124,6 @@ /MACHINE:I386 %(AdditionalOptions) true - %(IgnoreSpecificDefaultLibraries) true $(OutDir)$(ProjectName).pdb false @@ -133,8 +132,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib - xrCore.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false $(SolutionDir)lib\;%(AdditionalLibraryDirectories) @@ -177,15 +175,12 @@ /MACHINE:I386 /NODEFAULTLIB:LIBCMT %(AdditionalOptions) true - %(IgnoreSpecificDefaultLibraries) true false true - $(SolutionDir)lib\$(ProjectName).lib - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false - xrCore.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) $(SolutionDir)lib\;%(AdditionalLibraryDirectories) @@ -232,15 +227,13 @@ /MACHINE:I386 /NODEFAULTLIB:msvcp %(AdditionalOptions) true - %(IgnoreSpecificDefaultLibraries) true false true true true - $(SolutionDir)lib\$(ProjectName).lib - xrCore.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false $(SolutionDir)lib\;%(AdditionalLibraryDirectories) @@ -284,15 +277,14 @@ + + + {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} - false - - - diff --git a/src/xrLC/xrDO_Light/xrDO_Light.vcxproj b/src/xrLC/xrDO_Light/xrDO_Light.vcxproj index f33417977..584668e9a 100644 --- a/src/xrLC/xrDO_Light/xrDO_Light.vcxproj +++ b/src/xrLC/xrDO_Light/xrDO_Light.vcxproj @@ -61,18 +61,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -118,7 +118,7 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib $(SolutionDir)lib\;$(SolutionDir)sdk\MagicSoftware\FreeMagic\Library\ReleaseDLL\;%(AdditionalLibraryDirectories) false @@ -177,7 +177,7 @@ Windows true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib $(SolutionDir)lib\;$(SolutionDir)sdk\MagicSoftware\FreeMagic\Library\ReleaseDLL\;%(AdditionalLibraryDirectories) false @@ -234,7 +234,7 @@ true true true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib $(SolutionDir)lib\;$(SolutionDir)sdk\MagicSoftware\FreeMagic\Library\ReleaseDLL\;%(AdditionalLibraryDirectories) false diff --git a/src/xrLC/xrLC.vcxproj b/src/xrLC/xrLC.vcxproj index 4e427a537..4e3e97823 100644 --- a/src/xrLC/xrLC.vcxproj +++ b/src/xrLC/xrLC.vcxproj @@ -63,18 +63,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -135,7 +135,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;$(SolutionDir)sdk\MagicSoftware\FreeMagic\Library\ReleaseDLL\;%(AdditionalLibraryDirectories) false @@ -184,7 +184,7 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;$(SolutionDir)sdk\MagicSoftware\FreeMagic\Library\ReleaseDLL\;%(AdditionalLibraryDirectories) false @@ -243,7 +243,7 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;$(SolutionDir)sdk\MagicSoftware\FreeMagic\Library\ReleaseDLL\;%(AdditionalLibraryDirectories) false diff --git a/src/xrNetServer/xrNetServer.vcxproj b/src/xrNetServer/xrNetServer.vcxproj index 0be58ca7f..9737831ed 100644 --- a/src/xrNetServer/xrNetServer.vcxproj +++ b/src/xrNetServer/xrNetServer.vcxproj @@ -59,18 +59,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true @@ -130,7 +130,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib %(AdditionalLibraryDirectories) false @@ -186,7 +186,7 @@ true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib %(AdditionalLibraryDirectories) false @@ -239,7 +239,7 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib %(AdditionalLibraryDirectories) false diff --git a/src/xrODE/contrib/msvc7/ode_default/default.vcxproj b/src/xrODE/contrib/msvc7/ode_default/default.vcxproj index 445bbfba3..1dd4255ea 100644 --- a/src/xrODE/contrib/msvc7/ode_default/default.vcxproj +++ b/src/xrODE/contrib/msvc7/ode_default/default.vcxproj @@ -64,20 +64,20 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -128,7 +128,7 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -194,7 +194,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -255,7 +255,7 @@ $(OutDir)$(ProjectName).map Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false diff --git a/src/xrOpenAL/OpenAL-Windows/Router/Router.vcxproj b/src/xrOpenAL/OpenAL-Windows/Router/Router.vcxproj index 24af64134..01409b779 100644 --- a/src/xrOpenAL/OpenAL-Windows/Router/Router.vcxproj +++ b/src/xrOpenAL/OpenAL-Windows/Router/Router.vcxproj @@ -62,18 +62,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -118,7 +118,7 @@ true $(OutDir)OpenAL32.pdb true - $(SolutionDir)lib\OpenAL32.lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -172,7 +172,7 @@ $(OutDir)OpenAL32.pdb true UseLinkTimeCodeGeneration - $(SolutionDir)lib\OpenAL32.lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -229,7 +229,7 @@ $(OutDir)OpenAL32.pdb true UseLinkTimeCodeGeneration - $(SolutionDir)lib\OpenAL32.lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false diff --git a/src/xrParticles/xrParticles.vcxproj b/src/xrParticles/xrParticles.vcxproj index ac718775b..50bee1032 100644 --- a/src/xrParticles/xrParticles.vcxproj +++ b/src/xrParticles/xrParticles.vcxproj @@ -59,18 +59,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true @@ -129,7 +129,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false @@ -180,7 +180,7 @@ $(OutDir)$(ProjectName).map Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false @@ -231,7 +231,7 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false diff --git a/src/xrQSlim/xrQSlim.vcxproj b/src/xrQSlim/xrQSlim.vcxproj index dc7026187..839430f14 100644 --- a/src/xrQSlim/xrQSlim.vcxproj +++ b/src/xrQSlim/xrQSlim.vcxproj @@ -59,16 +59,16 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)lib\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)lib\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ - $(SolutionDir)lib\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)lib\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ - $(SolutionDir)lib\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)lib\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ diff --git a/src/xrSE_Factory/xrSE_Factory.vcxproj b/src/xrSE_Factory/xrSE_Factory.vcxproj index 41dd1c6a3..1e17b8d51 100644 --- a/src/xrSE_Factory/xrSE_Factory.vcxproj +++ b/src/xrSE_Factory/xrSE_Factory.vcxproj @@ -61,19 +61,19 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -113,11 +113,10 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false - luabind.beta7-devel.rc4.lib;lua.JIT.1.1.4.lib;%(AdditionalDependencies) @@ -173,11 +172,10 @@ false $(OutDir)$(ProjectName).map true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false - luabind.beta7-devel.rc4.lib;lua.JIT.1.1.4.lib;%(AdditionalDependencies) @@ -221,11 +219,10 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false - luabind.beta7-devel.rc4.lib;lua.JIT.1.1.4.lib;%(AdditionalDependencies) diff --git a/src/xrSound/xrSound.vcxproj b/src/xrSound/xrSound.vcxproj index 95ef6c90b..222e39c7d 100644 --- a/src/xrSound/xrSound.vcxproj +++ b/src/xrSound/xrSound.vcxproj @@ -59,19 +59,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ - true + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true @@ -107,7 +106,6 @@ /NODEFAULTLIB:LIBCMTD %(AdditionalOptions) - %(AdditionalDependencies) true true false @@ -115,7 +113,7 @@ false Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;$(SolutionDir)sdk\eax\;%(AdditionalLibraryDirectories) false @@ -154,7 +152,6 @@ stdcpp17 - OpenAL32.lib;%(AdditionalDependencies) true $(OutDir)$(ProjectName).pdb false @@ -164,7 +161,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;$(SolutionDir)sdk\eax\;%(AdditionalLibraryDirectories) false @@ -201,13 +198,12 @@ stdcpp17 - %(AdditionalDependencies) true false $(OutDir)$(ProjectName).map Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;$(SolutionDir)sdk\eax\;%(AdditionalLibraryDirectories) false diff --git a/src/xr_3da/XR_3DA.vcxproj b/src/xr_3da/XR_3DA.vcxproj index 5fdc3dfd9..0d8d0ab47 100644 --- a/src/xr_3da/XR_3DA.vcxproj +++ b/src/xr_3da/XR_3DA.vcxproj @@ -107,35 +107,33 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ - true + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\dedicated\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ - true + $(SolutionDir)bin\dedicated\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\dedicated\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\dedicated\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\dedicated\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\dedicated\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -186,7 +184,7 @@ /MACHINE:I386 %(AdditionalOptions) - lua.JIT.1.1.4.lib;luabind.beta7-devel.rc4.lib;msacm32.lib;vfw32.lib;%(AdditionalDependencies) + msacm32.lib;vfw32.lib;%(AdditionalDependencies) NotSet true libcmtd;libc;libcd;%(IgnoreSpecificDefaultLibraries) @@ -196,8 +194,7 @@ false Windows true - $(SolutionDir)lib\$(ProjectName).lib - $(SolutionDir)lib\;%(AdditionalLibraryDirectories) + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false @@ -245,7 +242,7 @@ /MACHINE:I386 %(AdditionalOptions) - lua.JIT.1.1.4.lib;luabind.beta7-devel.rc4.lib;msacm32.lib;vfw32.lib;%(AdditionalDependencies) + msacm32.lib;vfw32.lib;%(AdditionalDependencies) true libcmt;%(IgnoreSpecificDefaultLibraries) true @@ -253,10 +250,9 @@ $(OutDir)$(ProjectName).map Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false - $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -308,7 +304,7 @@ /MACHINE:I386 %(AdditionalOptions) - lua.JIT.1.1.4.lib;luabind.beta7-devel.rc4.lib;msacm32.lib;vfw32.lib;%(AdditionalDependencies) + msacm32.lib;vfw32.lib;%(AdditionalDependencies) true libcmt;%(IgnoreSpecificDefaultLibraries) true @@ -320,9 +316,8 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false - $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -372,7 +367,7 @@ /MACHINE:I386 %(AdditionalOptions) - lua.JIT.1.1.4.lib;luabind.beta7-devel.rc4.lib;msacm32.lib;vfw32.lib;%(AdditionalDependencies) + msacm32.lib;vfw32.lib;%(AdditionalDependencies) NotSet true libcmtd;libc;libcd;%(IgnoreSpecificDefaultLibraries) @@ -382,7 +377,6 @@ Windows true false - $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -429,7 +423,7 @@ /MACHINE:I386 %(AdditionalOptions) - lua.JIT.1.1.4.lib;luabind.beta7-devel.rc4.lib;msacm32.lib;vfw32.lib;%(AdditionalDependencies) + msacm32.lib;vfw32.lib;%(AdditionalDependencies) true libcmt;%(IgnoreSpecificDefaultLibraries) true @@ -439,7 +433,6 @@ true MachineX86 false - $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -487,7 +480,7 @@ /MACHINE:I386 %(AdditionalOptions) - lua.JIT.1.1.4.lib;luabind.beta7-devel.rc4.lib;msacm32.lib;vfw32.lib;%(AdditionalDependencies) + msacm32.lib;vfw32.lib;%(AdditionalDependencies) true libcmt;%(IgnoreSpecificDefaultLibraries) true @@ -498,7 +491,6 @@ true true false - $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -832,7 +824,6 @@ {ccca7859-eb86-493e-9b53-c4235f45b3c5} - false diff --git a/src/xr_3da/stalker_net/Stalker_net.vcxproj b/src/xr_3da/stalker_net/Stalker_net.vcxproj index e7c61d405..5784e36a0 100644 --- a/src/xr_3da/stalker_net/Stalker_net.vcxproj +++ b/src/xr_3da/stalker_net/Stalker_net.vcxproj @@ -64,18 +64,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -117,7 +117,7 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 %(AdditionalLibraryDirectories) false @@ -174,7 +174,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 %(AdditionalLibraryDirectories) false @@ -232,7 +232,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 %(AdditionalLibraryDirectories) false diff --git a/src/xr_3da/stdafx.h b/src/xr_3da/stdafx.h index ff8b19582..f59eaeb8c 100644 --- a/src/xr_3da/stdafx.h +++ b/src/xr_3da/stdafx.h @@ -52,7 +52,6 @@ extern ENGINE_API CInifile *pGameIni; #pragma comment( lib, "xrCore.lib" ) #pragma comment( lib, "xrCDB.lib" ) -#pragma comment( lib, "xrSound.lib" ) #pragma comment( lib, "winmm.lib" ) diff --git a/src/xr_3da/xrCPU_Pipe/xrCPU_Pipe.cpp b/src/xr_3da/xrCPU_Pipe/xrCPU_Pipe.cpp index 3f7973b45..3432e4e44 100644 --- a/src/xr_3da/xrCPU_Pipe/xrCPU_Pipe.cpp +++ b/src/xr_3da/xrCPU_Pipe/xrCPU_Pipe.cpp @@ -5,8 +5,6 @@ #include "xrCPU_Pipe.h" #pragma hdrstop -#pragma comment(lib,"xr_3DA") - BOOL APIENTRY DllMain( HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved diff --git a/src/xr_3da/xrCPU_Pipe/xrCPU_Pipe.vcxproj b/src/xr_3da/xrCPU_Pipe/xrCPU_Pipe.vcxproj index 1e6e7cc8e..abb312ffa 100644 --- a/src/xr_3da/xrCPU_Pipe/xrCPU_Pipe.vcxproj +++ b/src/xr_3da/xrCPU_Pipe/xrCPU_Pipe.vcxproj @@ -61,19 +61,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ - true + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true @@ -133,7 +132,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -191,7 +190,7 @@ false true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -246,7 +245,7 @@ false true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -310,14 +309,13 @@ + + {a19b1df2-82ec-4364-8bdf-85d13a1c89b5} + {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} false - - {2578c6d8-660d-48ae-9322-7422f8664f06} - false - diff --git a/src/xr_3da/xrGame/xrD3D9-Null/xrD3D9-Null.vcxproj b/src/xr_3da/xrGame/xrD3D9-Null/xrD3D9-Null.vcxproj index a82c7ab5f..a2ebac7bf 100644 --- a/src/xr_3da/xrGame/xrD3D9-Null/xrD3D9-Null.vcxproj +++ b/src/xr_3da/xrGame/xrD3D9-Null/xrD3D9-Null.vcxproj @@ -60,18 +60,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -101,7 +101,7 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -145,7 +145,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -189,7 +189,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false diff --git a/src/xr_3da/xrGame/xrGame.vcxproj b/src/xr_3da/xrGame/xrGame.vcxproj index 05587ae53..1d4c5e976 100644 --- a/src/xr_3da/xrGame/xrGame.vcxproj +++ b/src/xr_3da/xrGame/xrGame.vcxproj @@ -62,20 +62,22 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ - true + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true + $(SolutionDir)lib\$(Platform)\$(Configuration);$(LibraryPath) - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true + $(SolutionDir)lib\$(Platform)\$(Configuration);$(LibraryPath) - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false + $(SolutionDir)lib\$(Platform)\$(Configuration);$(LibraryPath) @@ -132,10 +134,8 @@ false true - $(SolutionDir)lib\$(ProjectName).lib - $(SolutionDir)lib\;%(AdditionalLibraryDirectories) + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false - luabind.beta7-devel.rc4.lib;lua.JIT.1.1.4.lib;%(AdditionalDependencies) @@ -190,11 +190,9 @@ false $(OutDir)$(ProjectName).map true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 - $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false - luabind.beta7-devel.rc4.lib;lua.JIT.1.1.4.lib;%(AdditionalDependencies) @@ -256,10 +254,8 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib - $(SolutionDir)lib\;%(AdditionalLibraryDirectories) + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib false - luabind.beta7-devel.rc4.lib;lua.JIT.1.1.4.lib;%(AdditionalDependencies) diff --git a/src/xr_3da/xrGame/xrGameSpy/xrGameSpy.vcxproj b/src/xr_3da/xrGame/xrGameSpy/xrGameSpy.vcxproj index 891a5c145..c867caae4 100644 --- a/src/xr_3da/xrGame/xrGameSpy/xrGameSpy.vcxproj +++ b/src/xr_3da/xrGame/xrGameSpy/xrGameSpy.vcxproj @@ -60,18 +60,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -102,7 +102,7 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -146,7 +146,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -190,7 +190,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false diff --git a/src/xr_3da/xrRender_R1/xrRender_R1.cpp b/src/xr_3da/xrRender_R1/xrRender_R1.cpp index afd4c191d..5a2c21513 100644 --- a/src/xr_3da/xrRender_R1/xrRender_R1.cpp +++ b/src/xr_3da/xrRender_R1/xrRender_R1.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include "..\xrRender\xrRender_console.h" -#pragma comment(lib,"xr_3DA") +#pragma comment(lib,"XR_3DA.lib") BOOL APIENTRY DllMain( HANDLE hModule, DWORD ul_reason_for_call, diff --git a/src/xr_3da/xrRender_R1/xrRender_R1.vcxproj b/src/xr_3da/xrRender_R1/xrRender_R1.vcxproj index 2518a0b29..237bfca8f 100644 --- a/src/xr_3da/xrRender_R1/xrRender_R1.vcxproj +++ b/src/xr_3da/xrRender_R1/xrRender_R1.vcxproj @@ -59,20 +59,22 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ - true + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true + $(SolutionDir)lib\$(Platform)\$(Configuration);$(LibraryPath) - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false + $(SolutionDir)lib\$(Platform)\$(Configuration);$(LibraryPath) - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true + $(SolutionDir)lib\$(Platform)\$(Configuration);$(LibraryPath) @@ -107,7 +109,7 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -154,7 +156,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -195,7 +197,7 @@ $(OutDir)$(ProjectName).map Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false diff --git a/src/xr_3da/xrRender_R2/xrRender_R2.cpp b/src/xr_3da/xrRender_R2/xrRender_R2.cpp index 566f5afe8..4eabd8bf7 100644 --- a/src/xr_3da/xrRender_R2/xrRender_R2.cpp +++ b/src/xr_3da/xrRender_R2/xrRender_R2.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" #include "..\xrRender\xrRender_console.h" -#pragma comment(lib,"xr_3DA") +#pragma comment(lib,"XR_3DA.lib") BOOL APIENTRY DllMain( HANDLE hModule, DWORD ul_reason_for_call, diff --git a/src/xr_3da/xrRender_R2/xrRender_R2.vcxproj b/src/xr_3da/xrRender_R2/xrRender_R2.vcxproj index 502663647..44d66b8f2 100644 --- a/src/xr_3da/xrRender_R2/xrRender_R2.vcxproj +++ b/src/xr_3da/xrRender_R2/xrRender_R2.vcxproj @@ -59,20 +59,22 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ - true + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true + $(SolutionDir)lib\$(Platform)\$(Configuration);$(LibraryPath) - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false + $(SolutionDir)lib\$(Platform)\$(Configuration);$(LibraryPath) - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true + $(SolutionDir)lib\$(Platform)\$(Configuration);$(LibraryPath) @@ -107,7 +109,7 @@ Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -154,7 +156,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false @@ -195,7 +197,7 @@ $(OutDir)$(ProjectName).map Windows true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 $(SolutionDir)lib\;%(AdditionalLibraryDirectories) false diff --git a/src/xr_3da/xrStatisticConvert/xrStatisticConvert.vcxproj b/src/xr_3da/xrStatisticConvert/xrStatisticConvert.vcxproj index 10ecf911f..6b2722680 100644 --- a/src/xr_3da/xrStatisticConvert/xrStatisticConvert.vcxproj +++ b/src/xr_3da/xrStatisticConvert/xrStatisticConvert.vcxproj @@ -61,18 +61,18 @@ <_ProjectFileVersion>11.0.61030.0 - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)bin\ - $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -101,7 +101,7 @@ Console true - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -144,7 +144,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false @@ -187,7 +187,7 @@ true true UseLinkTimeCodeGeneration - $(SolutionDir)lib\$(ProjectName).lib + $(SolutionDir)lib\$(Platform)\$(Configuration)\$(ProjectName).lib MachineX86 false