diff --git a/.gitignore b/.gitignore index 62c1fb08ed03dcbcb0c47e936d194750afcd469b..cddbd9907b7d83fa3aab669a4c5f56a1056fb366 100644 --- a/.gitignore +++ b/.gitignore @@ -223,3 +223,5 @@ docs/html/* /sdks/freetype-2.6/objs/ /sdks/freetype-2.10.0/objs/ + +/sdks/breakpad/ diff --git a/proj/SkyXEngine/vs2013/SkyXEngine.vcxproj b/proj/SkyXEngine/vs2013/SkyXEngine.vcxproj index 8020b3b3cc0c9219a06fca5dd2bb61bc1cbfc0a8..c146ec6b7bd6e52815dcd9a15d9c44c6d444efbd 100644 --- a/proj/SkyXEngine/vs2013/SkyXEngine.vcxproj +++ b/proj/SkyXEngine/vs2013/SkyXEngine.vcxproj @@ -110,7 +110,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <AdditionalDependencies>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)</AdditionalDependencies> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <Profile>true</Profile> @@ -130,7 +130,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <AdditionalDependencies>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)</AdditionalDependencies> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <Profile>true</Profile> @@ -153,7 +153,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <AdditionalOptions>/NODEFAULTLIB:LIBCMTD.lib %(AdditionalOptions)</AdditionalOptions> </Link> </ItemDefinitionGroup> @@ -174,7 +174,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <AdditionalOptions>/NODEFAULTLIB:LIBCMTD.lib %(AdditionalOptions)</AdditionalOptions> </Link> </ItemDefinitionGroup> diff --git a/proj/ddsplugin/vs2013/ddsplugin.vcxproj b/proj/ddsplugin/vs2013/ddsplugin.vcxproj index ed396da7181b62fe51fe731a4047ecda15989876..700c76423da44bd8d39cdcfc23c935cdd0433e97 100644 --- a/proj/ddsplugin/vs2013/ddsplugin.vcxproj +++ b/proj/ddsplugin/vs2013/ddsplugin.vcxproj @@ -121,7 +121,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -140,7 +140,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -161,7 +161,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -182,7 +182,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/dseplugin/vs2013/dseplugin.vcxproj b/proj/dseplugin/vs2013/dseplugin.vcxproj index b33520061a8e3c8999d0acf90953a3e29171ae0c..60ee2a11c13ec772e0b4d5769392fc33478db2ee 100644 --- a/proj/dseplugin/vs2013/dseplugin.vcxproj +++ b/proj/dseplugin/vs2013/dseplugin.vcxproj @@ -121,7 +121,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -140,7 +140,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -161,7 +161,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -182,7 +182,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/sxaigrid/vs2013/sxaigrid.vcxproj b/proj/sxaigrid/vs2013/sxaigrid.vcxproj index acdd9a2f6e70ba0218220ce72d729ab49d9968dc..1b84626caa892dbfab83e2d3a000fda417120f29 100644 --- a/proj/sxaigrid/vs2013/sxaigrid.vcxproj +++ b/proj/sxaigrid/vs2013/sxaigrid.vcxproj @@ -110,7 +110,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -129,7 +129,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -151,7 +151,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -172,7 +172,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/sxambient/vs2013/sxambient.vcxproj b/proj/sxambient/vs2013/sxambient.vcxproj index 671ebef10b80a48f9e5a7800960a36924c463308..5990f3be90296e1096df73005ac9716ca896ee8f 100644 --- a/proj/sxambient/vs2013/sxambient.vcxproj +++ b/proj/sxambient/vs2013/sxambient.vcxproj @@ -110,7 +110,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -129,7 +129,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -151,7 +151,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -172,7 +172,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/sxanim/vs2013/sxanim.vcxproj b/proj/sxanim/vs2013/sxanim.vcxproj index 87c89686a25c2210758e35679da1f46ceb844ac7..6883fc8b73263061edaf7fcbe659451e7b671777 100644 --- a/proj/sxanim/vs2013/sxanim.vcxproj +++ b/proj/sxanim/vs2013/sxanim.vcxproj @@ -112,7 +112,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -131,7 +131,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -152,7 +152,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -173,7 +173,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/sxconsole/vs2013/sxconsole.vcxproj b/proj/sxconsole/vs2013/sxconsole.vcxproj index 3a498de02d72d03956bade3cc1d217a316ff5825..2653137c9b778e7e19d7f9e1037512586c711b8d 100644 --- a/proj/sxconsole/vs2013/sxconsole.vcxproj +++ b/proj/sxconsole/vs2013/sxconsole.vcxproj @@ -100,7 +100,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -118,7 +118,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -139,7 +139,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -159,7 +159,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/proj/sxcore/vs2013/sxcore.vcxproj b/proj/sxcore/vs2013/sxcore.vcxproj index 1aeeaf4eb7334b7eac5a6e04cb040567a07b6d59..92dec683508f7e4af35bd7e8b7b186118bf23c29 100644 --- a/proj/sxcore/vs2013/sxcore.vcxproj +++ b/proj/sxcore/vs2013/sxcore.vcxproj @@ -213,7 +213,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -232,7 +232,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -255,7 +255,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -276,7 +276,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/proj/sxdecals/vs2013/sxdecals.vcxproj b/proj/sxdecals/vs2013/sxdecals.vcxproj index a1d7ed17218f8b4323671e4dbeaa50c2e036cc5c..6b4abb1908896ea38f228b94f685fda72f5d3d4f 100644 --- a/proj/sxdecals/vs2013/sxdecals.vcxproj +++ b/proj/sxdecals/vs2013/sxdecals.vcxproj @@ -116,7 +116,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -135,7 +135,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -157,7 +157,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -178,7 +178,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/proj/sxgame/vs2013/sxgame.vcxproj b/proj/sxgame/vs2013/sxgame.vcxproj index e8820ef50ed8bf0177b0c38e0889d92f3fa54488..722e66f157103daf6ad7a531422962717b524acd 100644 --- a/proj/sxgame/vs2013/sxgame.vcxproj +++ b/proj/sxgame/vs2013/sxgame.vcxproj @@ -108,7 +108,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -128,7 +128,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -150,7 +150,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -171,7 +171,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/proj/sxgcore/vs2013/sxgcore.vcxproj b/proj/sxgcore/vs2013/sxgcore.vcxproj index 511c54310e2bd4bc0d4280c8d01f9e11299336c3..788a688423e6fee2927e646a9bd7ace3106f5919 100644 --- a/proj/sxgcore/vs2013/sxgcore.vcxproj +++ b/proj/sxgcore/vs2013/sxgcore.vcxproj @@ -112,11 +112,11 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> <PostBuildEvent> - <Command>copy /y ..\..\..\sdks\graphix\build\bin\gxgapidx11.* ..\..\..\build\bin\</Command> + <Command>copy /y ..\..\..\sdks\graphix\build\bin\gxgapidx11.dll ..\..\..\build\bin\ && copy /y ..\..\..\sdks\graphix\build\bin\gxgapidx11.pdb ..\..\..\pdb\</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -134,11 +134,11 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> <PostBuildEvent> - <Command>copy /y ..\..\..\sdks\graphix\build\bin64\gxgapidx11.* ..\..\..\build\bin64\</Command> + <Command>copy /y ..\..\..\sdks\graphix\build\bin64\gxgapidx11.dll ..\..\..\build\bin64\ && copy /y ..\..\..\sdks\graphix\build\bin64\gxgapidx11.pdb ..\..\..\pdb64\</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -158,11 +158,11 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> <PostBuildEvent> - <Command>copy /y ..\..\..\sdks\graphix\build\bin\gxgapidx11.* ..\..\..\build\bin\</Command> + <Command>copy /y ..\..\..\sdks\graphix\build\bin\gxgapidx11.dll ..\..\..\build\bin\ && copy /y ..\..\..\sdks\graphix\build\bin\gxgapidx11.pdb ..\..\..\pdb\</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -182,11 +182,11 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> <PostBuildEvent> - <Command>copy /y ..\..\..\sdks\graphix\build\bin64\gxgapidx11.* ..\..\..\build\bin64\</Command> + <Command>copy /y ..\..\..\sdks\graphix\build\bin64\gxgapidx11.dll ..\..\..\build\bin64\ && copy /y ..\..\..\sdks\graphix\build\bin64\gxgapidx11.pdb ..\..\..\pdb64\</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemGroup> diff --git a/proj/sxgeom/vs2013/sxgeom.vcxproj b/proj/sxgeom/vs2013/sxgeom.vcxproj index 4f44f9dc0a78c1d313e8ccd46465cf5643d81a2f..61efd5f4b2a705396370958c0944525f1619c254 100644 --- a/proj/sxgeom/vs2013/sxgeom.vcxproj +++ b/proj/sxgeom/vs2013/sxgeom.vcxproj @@ -114,7 +114,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -133,7 +133,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -155,7 +155,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -176,7 +176,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/sxgreen/sxgreen/sxgreen.vcxproj b/proj/sxgreen/sxgreen/sxgreen.vcxproj index f7433cd103431ec2c17eff984f39ece4b5b0f9f0..2eda957b846263c65e6cb8bac30e74b871f2ef4e 100644 --- a/proj/sxgreen/sxgreen/sxgreen.vcxproj +++ b/proj/sxgreen/sxgreen/sxgreen.vcxproj @@ -111,7 +111,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -128,7 +128,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -148,7 +148,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -168,7 +168,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/sxgui/vs2013/sxgui.vcxproj b/proj/sxgui/vs2013/sxgui.vcxproj index 437406a1bbc5b4e8ee2c020e2af142ac461914b1..20a5301f425a9c32355ab91a0027d9be8697c584 100644 --- a/proj/sxgui/vs2013/sxgui.vcxproj +++ b/proj/sxgui/vs2013/sxgui.vcxproj @@ -107,7 +107,7 @@ </IgnoreSpecificDefaultLibraries> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> <Lib> <OutputFile>$(OutDir)$(TargetName)d$(TargetExt)</OutputFile> @@ -131,7 +131,7 @@ </IgnoreSpecificDefaultLibraries> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> </Link> <Lib> <OutputFile>$(OutDir)$(TargetName)d$(TargetExt)</OutputFile> @@ -158,7 +158,7 @@ <IgnoreSpecificDefaultLibraries> </IgnoreSpecificDefaultLibraries> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -182,7 +182,7 @@ <IgnoreSpecificDefaultLibraries> </IgnoreSpecificDefaultLibraries> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj b/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj index 4952b6d6492fc69d58ef29abdb49ad6ceb4c0bcc..d5b37e03af67340b1980fa2482d0c9d2c281af6e 100644 --- a/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj +++ b/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj @@ -127,7 +127,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -149,7 +149,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/proj/sxinput/vs2013/sxinput.vcxproj b/proj/sxinput/vs2013/sxinput.vcxproj index 4fe1d27306d0d818f52f56d136e1e3971c9034e4..ecb8f113cf65fb3c752329c7d1f29dfbdbd5a249 100644 --- a/proj/sxinput/vs2013/sxinput.vcxproj +++ b/proj/sxinput/vs2013/sxinput.vcxproj @@ -110,7 +110,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -129,7 +129,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -151,7 +151,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -172,7 +172,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/sxlight/vs2013/sxlight.vcxproj b/proj/sxlight/vs2013/sxlight.vcxproj index 0b4043ec3967640b871b0bf65b9e4a641fa20531..471b7fd63179361f68cecdb715f009896c120b27 100644 --- a/proj/sxlight/vs2013/sxlight.vcxproj +++ b/proj/sxlight/vs2013/sxlight.vcxproj @@ -112,7 +112,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -131,7 +131,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -152,7 +152,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -173,7 +173,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/sxmtrl/vs2013/sxmtrl.vcxproj b/proj/sxmtrl/vs2013/sxmtrl.vcxproj index e7da16a7b918db96bb4f1c53a8ba16450beec7b2..c7423f19bf5fcd29b926e0bec1bc4883faf13e60 100644 --- a/proj/sxmtrl/vs2013/sxmtrl.vcxproj +++ b/proj/sxmtrl/vs2013/sxmtrl.vcxproj @@ -108,7 +108,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -125,7 +125,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -146,7 +146,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -166,7 +166,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/sxparticles/vs2013/sxparticles.vcxproj b/proj/sxparticles/vs2013/sxparticles.vcxproj index 84429e4f8759520145ae6abf38627abde8d9de33..db6a76ae81b48065d7f2f9b58698e8c10a036d1b 100644 --- a/proj/sxparticles/vs2013/sxparticles.vcxproj +++ b/proj/sxparticles/vs2013/sxparticles.vcxproj @@ -110,7 +110,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -129,7 +129,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -151,7 +151,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -172,7 +172,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/sxphysics/vs2013/sxphysics.vcxproj b/proj/sxphysics/vs2013/sxphysics.vcxproj index 212cb13cc07a8acb0412abbedc4fbbc19435df5d..e0dba2e4a4a68aadc968c17100786d1231538618 100644 --- a/proj/sxphysics/vs2013/sxphysics.vcxproj +++ b/proj/sxphysics/vs2013/sxphysics.vcxproj @@ -107,7 +107,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -126,7 +126,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -148,7 +148,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -169,7 +169,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/proj/sxpp/vs2013/sxpp.vcxproj b/proj/sxpp/vs2013/sxpp.vcxproj index 78b541385ed11f9ce41e07dc28c34d6fd2d66b14..fc3d9266860fa930ab881e5b9e5edcd77a9902d4 100644 --- a/proj/sxpp/vs2013/sxpp.vcxproj +++ b/proj/sxpp/vs2013/sxpp.vcxproj @@ -112,7 +112,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -131,7 +131,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -153,7 +153,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -174,7 +174,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/sxrender/vs2013/sxrender.vcxproj b/proj/sxrender/vs2013/sxrender.vcxproj index d9e7ca77e9194bc6d142d8f48cbdd2c3c208108d..514922e26e93dc740459b88f7fc52a6c25b2f935 100644 --- a/proj/sxrender/vs2013/sxrender.vcxproj +++ b/proj/sxrender/vs2013/sxrender.vcxproj @@ -111,7 +111,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <Profile>true</Profile> </Link> @@ -131,7 +131,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <Profile>true</Profile> </Link> @@ -154,7 +154,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -175,7 +175,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/proj/sxscore/vs2013/sxscore.vcxproj b/proj/sxscore/vs2013/sxscore.vcxproj index ec79685799f67b8b8d074a140673fc17c06f29b3..3f8af6b3ac7d2a6af5648bad3a232a6e027681b5 100644 --- a/proj/sxscore/vs2013/sxscore.vcxproj +++ b/proj/sxscore/vs2013/sxscore.vcxproj @@ -127,7 +127,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -146,7 +146,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> <Profile>true</Profile> </Link> @@ -168,7 +168,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -189,7 +189,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/terrax/vs2013/terrax.vcxproj b/proj/terrax/vs2013/terrax.vcxproj index 687ae02cf850b434c005e84b9739f9a31c8c7a11..57d54962161a8f7479174154ed111c6ad965aac9 100644 --- a/proj/terrax/vs2013/terrax.vcxproj +++ b/proj/terrax/vs2013/terrax.vcxproj @@ -110,7 +110,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> <AdditionalOptions>"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" %(AdditionalOptions)</AdditionalOptions> @@ -130,7 +130,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> <AdditionalOptions>"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" %(AdditionalOptions)</AdditionalOptions> @@ -153,7 +153,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <AdditionalOptions>"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" %(AdditionalOptions)</AdditionalOptions> </Link> @@ -175,7 +175,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <AdditionalOptions>"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" %(AdditionalOptions)</AdditionalOptions> </Link> diff --git a/proj/xEngine/vs2013/xEngine.vcxproj b/proj/xEngine/vs2013/xEngine.vcxproj index 569de9e2b6039ecd90c56401f9f9186461253380..2595ac7211d9f1f8e67f69753504403fb29c3263 100644 --- a/proj/xEngine/vs2013/xEngine.vcxproj +++ b/proj/xEngine/vs2013/xEngine.vcxproj @@ -111,7 +111,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <Profile>true</Profile> </Link> @@ -131,7 +131,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <Profile>true</Profile> </Link> @@ -154,7 +154,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -175,7 +175,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/proj/xSpecs/vs2013/xSpecs.vcxproj b/proj/xSpecs/vs2013/xSpecs.vcxproj index 69c4f14b428ec9603ec5c39ce7e82d5b2fffa5b2..379119ed2b41e68c1f3aa0a35280ee5d43dd1cec 100644 --- a/proj/xSpecs/vs2013/xSpecs.vcxproj +++ b/proj/xSpecs/vs2013/xSpecs.vcxproj @@ -124,7 +124,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -143,7 +143,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <Profile>true</Profile> </Link> </ItemDefinitionGroup> @@ -164,7 +164,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> @@ -185,7 +185,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> diff --git a/proj/xUI/vs2013/xUI.vcxproj b/proj/xUI/vs2013/xUI.vcxproj index 39dbd30a015d4bf6c6ea43e495b3f96771946c68..c8211c62265312e9c4b652d590beb913e47d9341 100644 --- a/proj/xUI/vs2013/xUI.vcxproj +++ b/proj/xUI/vs2013/xUI.vcxproj @@ -121,7 +121,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <Profile>true</Profile> </Link> @@ -141,7 +141,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <Profile>true</Profile> </Link> @@ -164,7 +164,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -185,7 +185,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/proj/xWindow/vs2013/xWindow.vcxproj b/proj/xWindow/vs2013/xWindow.vcxproj index 4772d1f33cf58c6951cbf624bc43cad156ec9690..7883716a6a991cec5108db4a5b28a6f7c5428032 100644 --- a/proj/xWindow/vs2013/xWindow.vcxproj +++ b/proj/xWindow/vs2013/xWindow.vcxproj @@ -111,7 +111,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <Profile>true</Profile> </Link> @@ -131,7 +131,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <Profile>true</Profile> </Link> @@ -154,7 +154,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -175,7 +175,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary> - <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(ProjectDir)../../../pdb64/$(TargetName).pdb</ProgramDatabaseFile> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/sdks/graphix b/sdks/graphix index 64e89c456386652abf99dc408923a05b4f8515cb..ef6c04f150fff506dcc9160aa5efc71d0c0e03a3 160000 --- a/sdks/graphix +++ b/sdks/graphix @@ -1 +1 @@ -Subproject commit 64e89c456386652abf99dc408923a05b4f8515cb +Subproject commit ef6c04f150fff506dcc9160aa5efc71d0c0e03a3 diff --git a/source/core/Core.cpp b/source/core/Core.cpp index 00b3ed8f9e5d835ea5e643a62773c200b2799ca8..8f32ce6887f0fa0314cf4c6c90eaa59b7eddfecd 100644 --- a/source/core/Core.cpp +++ b/source/core/Core.cpp @@ -461,20 +461,20 @@ void XMETHODCALLTYPE CCore::waitForLoop(ID id) //########################################################################## -C SXCORE_API IXCore* XCoreInit(const char *szName) +EXTERN_C SXCORE_API IXCore* XCoreInit(const char *szName) { return(g_pCore = new CCore(szName)); } -C SXCORE_API void XCoreStart() +EXTERN_C SXCORE_API void XCoreStart() { g_pTaskManager->start(); } -C SXCORE_API void XCoreStop() +EXTERN_C SXCORE_API void XCoreStop() { g_pTaskManager->stop(); } -C SXCORE_API void XCoreAddTask(ITask *pTask) +EXTERN_C SXCORE_API void XCoreAddTask(ITask *pTask) { g_pTaskManager->addTask(pTask); } diff --git a/source/core/sxcore.h b/source/core/sxcore.h index bf665fe3825f52960da96633f1ac9aa9d9230d15..a3ab189b04d232834de49a9f2e1f5408adc6d787 100644 --- a/source/core/sxcore.h +++ b/source/core/sxcore.h @@ -32,7 +32,7 @@ See the license in LICENSE #else # define SXCORE_API #endif -#define C extern "C" +#define EXTERN_C extern "C" #include <io.h> #include <fcntl.h> @@ -74,10 +74,10 @@ enum CORE_TASK_FLAG //! @FIXME: Убрать это! class ITask; -C SXCORE_API IXCore* XCoreInit(const char *szName); -C SXCORE_API void XCoreStart(); -C SXCORE_API void XCoreStop(); -C SXCORE_API void XCoreAddTask(ITask *pTask); +EXTERN_C SXCORE_API IXCore* XCoreInit(const char *szName); +EXTERN_C SXCORE_API void XCoreStart(); +EXTERN_C SXCORE_API void XCoreStop(); +EXTERN_C SXCORE_API void XCoreAddTask(ITask *pTask); //! возвращает версию ядра SX_LIB_API long Core_0GetVersion(); diff --git a/source/xEngine/CommandLineToArgvA.cpp b/source/xEngine/CommandLineToArgvA.cpp index 16a7b19e29e6d26702fcc98f4dcb9b7e37e69423..18d9ed8438ea3596ef1a0f85476b832a22f3c203 100644 --- a/source/xEngine/CommandLineToArgvA.cpp +++ b/source/xEngine/CommandLineToArgvA.cpp @@ -30,7 +30,7 @@ * - in unquoted strings, the first quote opens the quoted string and the * remaining consecutive quotes follow the above rule. */ -C XAPI LPSTR* CommandLineToArgvA(LPSTR lpCmdline, int *numargs) +EXTERN_C XAPI LPSTR* CommandLineToArgvA(LPSTR lpCmdline, int *numargs) { DWORD argc; LPSTR *argv; diff --git a/source/xEngine/Engine.cpp b/source/xEngine/Engine.cpp index 9f13b586665c92b096e9466cd6dcbcf3e7eed19a..110bcef5a2e0cb0d2ab9fb875165efc294477dfe 100644 --- a/source/xEngine/Engine.cpp +++ b/source/xEngine/Engine.cpp @@ -12,6 +12,12 @@ # pragma comment(lib, "sxcore.lib") #endif +#ifdef USE_BREAKPAD +# pragma comment(lib, "crash_generation_client.lib") +# pragma comment(lib, "exception_handler.lib") +# pragma comment(lib, "common.lib") +#endif + class CMainLoopTask: public ITaskImpl<ITask> { public: @@ -35,6 +41,32 @@ protected: //########################################################################## +#ifdef USE_BREAKPAD +static bool HandleCrashDump(const wchar_t *wszDumpPath, const wchar_t* wszMinidumpId, void* pContext, EXCEPTION_POINTERS* pExInfo, MDRawAssertionInfo* pAssertion, bool isSucceeded) +{ + wchar_t *pCrashReporter = (wchar_t*)pContext; + if(isSucceeded) + { + wcscat(pCrashReporter, wszMinidumpId); + STARTUPINFOW info = {sizeof(info)}; + PROCESS_INFORMATION processInfo; + if(CreateProcessW(NULL, pCrashReporter, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) + { + CloseHandle(processInfo.hProcess); + CloseHandle(processInfo.hThread); + } + } + else + { + MessageBoxW(NULL, L"Program has crashed. Failed to write crashdump.", L"Crashed!", MB_OK | MB_ICONSTOP); + } + //MessageBoxW(NULL, wszMinidumpId, pCrashReporter, MB_OK | MB_ICONSTOP); + return(true); +} +#endif + +//########################################################################## + CEngine::CEngine(int argc, char **argv, const char *szName) { srand((UINT)time(0)); @@ -51,9 +83,40 @@ CEngine::CEngine(int argc, char **argv, const char *szName) dirname(szPath); strcat(szPath, "gamesource/"); BOOL ret = SetCurrentDirectoryA(szPath); - int a = 0; } +#ifdef USE_BREAKPAD + { + static wchar_t szPath[MAX_PATH]; + GetModuleFileNameW(NULL, szPath, MAX_PATH); + int iLastPos = -1; + for(size_t i = 0, l = wcslen(szPath); i < l; ++i) + { + if(szPath[i] == L'/' || szPath[i] == L'\\') + { + iLastPos = (int)i; + } + } + if(iLastPos >= 0) + { + szPath[iLastPos + 1] = 0; + } + wcscat(szPath, L"crashreporter.exe "); // Keep last space! + + CreateDirectoryA("../crashdmp", NULL); + m_pBreakpadHandler = new google_breakpad::ExceptionHandler( + L"../crashdmp/", + NULL, + HandleCrashDump, + szPath, + google_breakpad::ExceptionHandler::HANDLER_ALL, + MiniDumpNormal, + L"", + NULL); + } +#endif + + m_pCore = XCoreInit(szName); INIT_OUTPUT_STREAM(m_pCore); LibReport(REPORT_MSG_LEVEL_NOTICE, "LIB core initialized\n"); @@ -82,6 +145,10 @@ CEngine::~CEngine() SGCore_AKill(); //SSInput_AKill(); mem_delete(m_pCore); + +#ifdef USE_BREAKPAD + mem_delete(m_pBreakpadHandler); +#endif } bool XMETHODCALLTYPE CEngine::initGraphics(XWINDOW_OS_HANDLE hWindow, IXEngineCallback *pCallback) @@ -553,7 +620,7 @@ void CEngine::onRWinBorderlessChanged() //########################################################################## -C XAPI IXEngine* XEngineInit(int argc, char **argv, const char *szName) +EXTERN_C XAPI IXEngine* XEngineInit(int argc, char **argv, const char *szName) { return(new CEngine(argc, argv, szName)); } diff --git a/source/xEngine/Engine.h b/source/xEngine/Engine.h index 10b380dc514a5fbe2e54527b678a5ada2670d5d1..aae1cc317ebed8d797027681bf5b29dfea2e8cc3 100644 --- a/source/xEngine/Engine.h +++ b/source/xEngine/Engine.h @@ -4,6 +4,12 @@ #include "IXEngine.h" #include <xUI/IXUI.h> +// #define USE_BREAKPAD + +#ifdef USE_BREAKPAD +# include <breakpad/src/client/windows/handler/exception_handler.h> +#endif + enum WANT_RESIZE { WR_NONE = 0x0000, @@ -48,6 +54,10 @@ protected: WANT_RESIZE m_wantResize = WR_NONE; IXUI *m_pXUI = NULL; + +#ifdef USE_BREAKPAD + google_breakpad::ExceptionHandler *m_pBreakpadHandler = NULL; +#endif }; DEFINE_ENUM_FLAG_OPERATORS(WANT_RESIZE); diff --git a/source/xEngine/IXEngine.h b/source/xEngine/IXEngine.h index fd68696229f5ae9c61321f08e92f1037820d5849..7d4feece43bb828dcdf94618b9df8ee4c0e8f3da 100644 --- a/source/xEngine/IXEngine.h +++ b/source/xEngine/IXEngine.h @@ -14,7 +14,7 @@ #else # define XAPI #endif -#define C extern "C" +#define EXTERN_C extern "C" class IXEngine; class ICamera; @@ -41,7 +41,7 @@ public: virtual IXCore* XMETHODCALLTYPE getCore() = 0; }; -C XAPI LPSTR* CommandLineToArgvA(LPSTR lpCmdline, int *numargs); -C XAPI IXEngine* XEngineInit(int argc, char **argv, const char *szName); +EXTERN_C XAPI LPSTR* CommandLineToArgvA(LPSTR lpCmdline, int *numargs); +EXTERN_C XAPI IXEngine* XEngineInit(int argc, char **argv, const char *szName); #endif diff --git a/source/xWindow/IXWindowSystem.h b/source/xWindow/IXWindowSystem.h index 570992a94a2173362fa21477983b52c01c4d558d..f402314a49edd6d20f9f42d99e241710b5034be8 100644 --- a/source/xWindow/IXWindowSystem.h +++ b/source/xWindow/IXWindowSystem.h @@ -12,7 +12,7 @@ #else # define XWAPI #endif -#define C extern "C" +#define EXTERN_C extern "C" enum XWINDOW_FLAG { @@ -92,6 +92,6 @@ public: virtual bool XMETHODCALLTYPE processMessages(UINT uMaxMessages = 0) = 0; }; -C XWAPI IXWindowSystem* XWindowInit(); +EXTERN_C XWAPI IXWindowSystem* XWindowInit(); #endif diff --git a/source/xWindow/WindowSystem.cpp b/source/xWindow/WindowSystem.cpp index 3713ce9d7dd7d60c16f76f80150b18d97d0f7c3f..9373ea957058720d21c379a82dabfbac8e030117 100644 --- a/source/xWindow/WindowSystem.cpp +++ b/source/xWindow/WindowSystem.cpp @@ -48,7 +48,7 @@ bool XMETHODCALLTYPE CWindowSystem::processMessages(UINT uMaxMessages) return(true); } -C XWAPI IXWindowSystem* XWindowInit() +EXTERN_C XWAPI IXWindowSystem* XWindowInit() { return(new CWindowSystem()); }