From 9cb66601f8040e7b034cc541af8cd973e0c28cbd Mon Sep 17 00:00:00 2001 From: Silent Date: Tue, 12 Sep 2017 13:48:15 +0200 Subject: [PATCH] Master builds (Release = optimizations + assertions) --- .gitignore | 1 + DDraw/DDraw.vcxproj | 14 +++--- SilentPatch.sln | 22 +++++++-- SilentPatchIII/SilentPatchIII.vcxproj | 58 ++++++++++++++++++++++ SilentPatchSA/SilentPatchSA.vcxproj | 70 ++++++++++++++++++++++++++- SilentPatchSA/StdAfxSA.h | 6 +-- SilentPatchVC/SilentPatchVC.vcxproj | 56 +++++++++++++++++++++ 7 files changed, 211 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 0ac7de7..97a959e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ [Rr]elease/ [Nn]ormal/ [Nn]ightly/ +[Mm]aster/ output/ symbols/ x64/ diff --git a/DDraw/DDraw.vcxproj b/DDraw/DDraw.vcxproj index 52981e4..28dc091 100644 --- a/DDraw/DDraw.vcxproj +++ b/DDraw/DDraw.vcxproj @@ -1,8 +1,8 @@  - - Release + + Master Win32 @@ -12,7 +12,7 @@ DDraw - + DynamicLibrary false true @@ -22,18 +22,18 @@ - + - + ddraw - + .dll - + Level4 MaxSpeed diff --git a/SilentPatch.sln b/SilentPatch.sln index 01560ed..b177e59 100644 --- a/SilentPatch.sln +++ b/SilentPatch.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 14.0.25420.1 +VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DDraw", "DDraw\DDraw.vcxproj", "{B695EC1B-7258-426A-81CF-9323C016ACFB}" EndProject @@ -14,27 +14,39 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Master|Win32 = Master|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B695EC1B-7258-426A-81CF-9323C016ACFB}.Debug|Win32.ActiveCfg = Release|Win32 - {B695EC1B-7258-426A-81CF-9323C016ACFB}.Debug|Win32.Build.0 = Release|Win32 - {B695EC1B-7258-426A-81CF-9323C016ACFB}.Release|Win32.ActiveCfg = Release|Win32 - {B695EC1B-7258-426A-81CF-9323C016ACFB}.Release|Win32.Build.0 = Release|Win32 + {B695EC1B-7258-426A-81CF-9323C016ACFB}.Debug|Win32.ActiveCfg = Master|Win32 + {B695EC1B-7258-426A-81CF-9323C016ACFB}.Debug|Win32.Build.0 = Master|Win32 + {B695EC1B-7258-426A-81CF-9323C016ACFB}.Master|Win32.ActiveCfg = Master|Win32 + {B695EC1B-7258-426A-81CF-9323C016ACFB}.Master|Win32.Build.0 = Master|Win32 + {B695EC1B-7258-426A-81CF-9323C016ACFB}.Release|Win32.ActiveCfg = Master|Win32 + {B695EC1B-7258-426A-81CF-9323C016ACFB}.Release|Win32.Build.0 = Master|Win32 {652975D8-60B0-48E4-A973-4F10BA54FFCB}.Debug|Win32.ActiveCfg = Debug|Win32 {652975D8-60B0-48E4-A973-4F10BA54FFCB}.Debug|Win32.Build.0 = Debug|Win32 + {652975D8-60B0-48E4-A973-4F10BA54FFCB}.Master|Win32.ActiveCfg = Master|Win32 + {652975D8-60B0-48E4-A973-4F10BA54FFCB}.Master|Win32.Build.0 = Master|Win32 {652975D8-60B0-48E4-A973-4F10BA54FFCB}.Release|Win32.ActiveCfg = Release|Win32 {652975D8-60B0-48E4-A973-4F10BA54FFCB}.Release|Win32.Build.0 = Release|Win32 {D3E18BC0-A120-451D-A16A-F77072625D66}.Debug|Win32.ActiveCfg = Debug|Win32 {D3E18BC0-A120-451D-A16A-F77072625D66}.Debug|Win32.Build.0 = Debug|Win32 + {D3E18BC0-A120-451D-A16A-F77072625D66}.Master|Win32.ActiveCfg = Master|Win32 + {D3E18BC0-A120-451D-A16A-F77072625D66}.Master|Win32.Build.0 = Master|Win32 {D3E18BC0-A120-451D-A16A-F77072625D66}.Release|Win32.ActiveCfg = Release|Win32 {D3E18BC0-A120-451D-A16A-F77072625D66}.Release|Win32.Build.0 = Release|Win32 {374D4CB4-548A-4DA0-AB68-8EA356424626}.Debug|Win32.ActiveCfg = Debug|Win32 {374D4CB4-548A-4DA0-AB68-8EA356424626}.Debug|Win32.Build.0 = Debug|Win32 + {374D4CB4-548A-4DA0-AB68-8EA356424626}.Master|Win32.ActiveCfg = Master|Win32 + {374D4CB4-548A-4DA0-AB68-8EA356424626}.Master|Win32.Build.0 = Master|Win32 {374D4CB4-548A-4DA0-AB68-8EA356424626}.Release|Win32.ActiveCfg = Release|Win32 {374D4CB4-548A-4DA0-AB68-8EA356424626}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D0F34D6C-5709-4FE9-828C-CE820B13E4EE} + EndGlobalSection EndGlobal diff --git a/SilentPatchIII/SilentPatchIII.vcxproj b/SilentPatchIII/SilentPatchIII.vcxproj index fb86ac0..115f685 100644 --- a/SilentPatchIII/SilentPatchIII.vcxproj +++ b/SilentPatchIII/SilentPatchIII.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Master + Win32 + Release Win32 @@ -14,12 +18,14 @@ NotUsing NotUsing + NotUsing Create Create + Create @@ -52,6 +58,13 @@ Unicode v141_xp + + DynamicLibrary + false + true + Unicode + v141_xp + @@ -64,6 +77,10 @@ + + + + .asi @@ -73,6 +90,10 @@ .asi SilentPatchIII + + .asi + SilentPatchIII + Level4 @@ -103,6 +124,43 @@ + + Level4 + MaxSpeed + true + true + MultiThreaded + true + AnySuitable + Speed + true + _HAS_EXCEPTIONS=0;_GTA_III;%(PreprocessorDefinitions) + ..\SilentPatch + Use + StdAfx.h + NoExtensions + Fast + /Zc:threadSafeInit- %(AdditionalOptions) + true + stdcpp17 + true + false + false + + + true + true + true + Windows + + + Winmm.lib;Shlwapi.lib;%(AdditionalDependencies) + + + copy /y "$(TargetPath)" "D:\Steam\steamapps\common\Grand Theft Auto 3\SilentPatchIII.asi" + + + Level4 MaxSpeed diff --git a/SilentPatchSA/SilentPatchSA.vcxproj b/SilentPatchSA/SilentPatchSA.vcxproj index 3f4d516..0fac22a 100644 --- a/SilentPatchSA/SilentPatchSA.vcxproj +++ b/SilentPatchSA/SilentPatchSA.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Master + Win32 + Release Win32 @@ -30,6 +34,13 @@ Unicode v141_xp + + DynamicLibrary + false + true + Unicode + v141_xp + @@ -42,6 +53,10 @@ + + + + .asi @@ -51,6 +66,10 @@ .asi SilentPatchSA + + .asi + SilentPatchSA + Level4 @@ -92,7 +111,7 @@ copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\scripts\newsteam_r2_lowvio AnySuitable Speed true - _HAS_EXCEPTIONS=0;_GTA_SA;NDEBUG;_SECURE_SCL=0;%(PreprocessorDefinitions) + _HAS_EXCEPTIONS=0;_GTA_SA;%(PreprocessorDefinitions) true MultiThreaded D:\RWSDK\Graphics\rwsdk\include\d3d9;..\SilentPatch;$(DXSDK_DIR)\include @@ -117,6 +136,46 @@ copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\scripts\newsteam_r2_lowvio copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\SilentPatchSA.asi" copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\scripts\gta-sa_newsteam_r2\SilentPatchSA.asi" +copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\scripts\newsteam_r2_lowviolence_gta-sa\SilentPatchSA.asi" + + + 2.0 + + + + + Level4 + MaxSpeed + true + true + AnySuitable + Speed + true + _HAS_EXCEPTIONS=0;_GTA_SA;NDEBUG;_SECURE_SCL=0;%(PreprocessorDefinitions) + true + MultiThreaded + D:\RWSDK\Graphics\rwsdk\include\d3d9;..\SilentPatch;$(DXSDK_DIR)\include + Use + StdAfxSA.h + NoExtensions + /Zc:threadSafeInit- %(AdditionalOptions) + Fast + true + true + false + stdcpp17 + false + + + false + true + true + Windows + Shlwapi.lib;libFLAC_static.lib;%(AdditionalDependencies) + + + copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\SilentPatchSA.asi" +copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\scripts\gta-sa_newsteam_r2\SilentPatchSA.asi" copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\scripts\newsteam_r2_lowviolence_gta-sa\SilentPatchSA.asi" @@ -127,10 +186,12 @@ copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\scripts\newsteam_r2_lowvio NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing @@ -144,6 +205,7 @@ copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\scripts\newsteam_r2_lowvio Create Create + Create @@ -156,14 +218,20 @@ copy /y "$(TargetPath)" "D:\gry\GTA San Andreas clean\scripts\newsteam_r2_lowvio ..\SilentPatch\nvc.cso Compiling shaders... fxc /T vs_2_0 /E NVC_vertex_shader /Fo ..\SilentPatch\nvc.cso ..\SilentPatch\nvc.fx + fxc /T vs_2_0 /E NVC_vertex_shader /Fo ..\SilentPatch\nvc.cso ..\SilentPatch\nvc.fx Compiling shaders... + Compiling shaders... ..\SilentPatch\nvc.cso + ..\SilentPatch\nvc.cso NVC_vertex_shader Vertex NVC_vertex_shader + NVC_vertex_shader Vertex + Vertex $(SolutionDir)\SilentPatch\%(Filename).cso $(SolutionDir)\SilentPatch\%(Filename).cso + $(SolutionDir)\SilentPatch\%(Filename).cso diff --git a/SilentPatchSA/StdAfxSA.h b/SilentPatchSA/StdAfxSA.h index debf404..bfc8b11 100644 --- a/SilentPatchSA/StdAfxSA.h +++ b/SilentPatchSA/StdAfxSA.h @@ -36,8 +36,8 @@ extern unsigned char& nGameClockMonths; #define DISABLE_FLA_DONATION_WINDOW 0 -#ifdef NDEBUG -#define MEM_VALIDATORS 0 -#else +#ifdef _DEBUG #define MEM_VALIDATORS 1 +#else +#define MEM_VALIDATORS 0 #endif diff --git a/SilentPatchVC/SilentPatchVC.vcxproj b/SilentPatchVC/SilentPatchVC.vcxproj index 02e4585..1ddf939 100644 --- a/SilentPatchVC/SilentPatchVC.vcxproj +++ b/SilentPatchVC/SilentPatchVC.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Master + Win32 + Release Win32 @@ -30,6 +34,13 @@ Unicode v141_xp + + DynamicLibrary + false + true + Unicode + v141_xp + @@ -42,6 +53,10 @@ + + + + .asi @@ -51,6 +66,10 @@ .asi SilentPatchVC + + .asi + SilentPatchVC + Level4 @@ -79,6 +98,41 @@ + + Level4 + MaxSpeed + true + true + _HAS_EXCEPTIONS=0;_GTA_VC;%(PreprocessorDefinitions) + true + MultiThreaded + AnySuitable + Speed + true + ..\SilentPatch + Use + StdAfx.h + NoExtensions + Fast + /Zc:threadSafeInit- %(AdditionalOptions) + true + false + true + false + stdcpp17 + + + true + true + true + Windows + Winmm.lib;Shlwapi.lib;%(AdditionalDependencies) + + + copy /y "$(TargetPath)" "D:\Steam\steamapps\common\Grand Theft Auto Vice City\SilentPatchVC.asi" + + + Level4 MaxSpeed @@ -124,12 +178,14 @@ NotUsing NotUsing + NotUsing Create Create + Create