Last active
March 3, 2019 20:06
-
-
Save michicc/6e9e8701e0a6a6bafaa72cce09bd3e0e to your computer and use it in GitHub Desktop.
Asserts?
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/projects/openttd_vs141.vcxproj b/projects/openttd_vs141.vcxproj | |
index 66974da28f..04d5951a25 100644 | |
--- a/projects/openttd_vs141.vcxproj | |
+++ b/projects/openttd_vs141.vcxproj | |
@@ -24,6 +24,7 @@ | |
<RootNamespace>openttd</RootNamespace> | |
<VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> | |
<VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> | |
+ <DisableAsserts>0</DisableAsserts> | |
</PropertyGroup> | |
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
@@ -107,7 +108,7 @@ | |
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed> | |
<OmitFramePointers>true</OmitFramePointers> | |
<AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
+ <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
<StringPooling>true</StringPooling> | |
<ExceptionHandling>Sync</ExceptionHandling> | |
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
@@ -230,7 +231,7 @@ | |
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed> | |
<OmitFramePointers>true</OmitFramePointers> | |
<AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
+ <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
<StringPooling>true</StringPooling> | |
<ExceptionHandling>Sync</ExceptionHandling> | |
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
@@ -337,6 +338,11 @@ | |
<Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command> | |
</PostBuildEvent> | |
</ItemDefinitionGroup> | |
+ <ItemDefinitionGroup Condition="'$(Configuration)'=='Release' And '$(DisableAsserts)'=='0'"> | |
+ <ClCompile> | |
+ <PreprocessorDefinitions>WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
+ </ClCompile> | |
+ </ItemDefinitionGroup> | |
<ItemGroup> | |
<ClCompile Include="..\src\airport.cpp" /> | |
<ClCompile Include="..\src\animated_tile.cpp" /> | |
diff --git a/azure-pipelines/templates/windows-build.yml b/azure-pipelines/templates/windows-build.yml | |
index 5e12f2243f..e71b0838d6 100644 | |
--- a/azure-pipelines/templates/windows-build.yml | |
+++ b/azure-pipelines/templates/windows-build.yml | |
@@ -1,5 +1,6 @@ | |
parameters: | |
BuildPlatform: '' | |
+ DisableAsserts: '0' | |
steps: | |
- task: VSBuild@1 | |
@@ -9,3 +10,4 @@ steps: | |
platform: ${{ parameters.BuildPlatform }} | |
configuration: Release | |
maximumCpuCount: true | |
+ msbuildArguments: /p:DisableAsserts="${{ parameters.DisableAsserts }}" | |
diff --git a/azure-pipelines/templates/release.yml b/azure-pipelines/templates/release.yml | |
index 7628d3c91e..5abe69ad9f 100644 | |
--- a/azure-pipelines/templates/release.yml | |
+++ b/azure-pipelines/templates/release.yml | |
@@ -88,6 +88,8 @@ jobs: | |
- template: windows-build.yml | |
parameters: | |
BuildPlatform: $(BuildPlatform) | |
+ ${{ if eq(parameters.IsStableRelease, true) }}: | |
+ DisableAsserts: 1 | |
- bash: | | |
set -ex | |
make -f Makefile.msvc bundle_pdb bundle_zip PLATFORM=$(BundlePlatform) BUNDLE_NAME=openttd-$(Build.BuildNumber)-windows-$(BundlePlatform) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment