Skip to content

Commit b72c787

Browse files
author
MarcoFalke
committed
Merge #15431: msvc: scripted-diff: Remove NDEBUG pre-define in project file
3ec56be appveyor: Remove unused NDEBUG removal (Chun Kuan Lee) 8a1f0a3 scripted-diff: Remove NDEBUG pre-define (Chun Kuan Lee) Pull request description: Follow #15391 Tree-SHA512: f264418cbc69b5f083469ed9005a6d592d4268f2b7da967e571ce30195de73b09a9e14c8610a5b6b0f056847d82a4bc7c2fbe56498307093aab4dd42903e6137
2 parents 4064d04 + 3ec56be commit b72c787

File tree

18 files changed

+34
-35
lines changed

18 files changed

+34
-35
lines changed

‎.appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ before_build:
2828
${content} = (Get-Content ${files}[${i}]);
2929
${content} = ${content}.Replace("</RuntimeLibrary>", "</RuntimeLibrary><DebugInformationFormat>None</DebugInformationFormat>");
3030
${content} = ${content}.Replace("<WholeProgramOptimization>true", "<WholeProgramOptimization>false");
31-
${content} = ${content}.Replace("NDEBUG;", "");
3231
Set-Content ${files}[${i}] ${content};
3332
}
3433
- ps: Start-Process clcache-server

‎build_msvc/bitcoin-cli/bitcoin-cli.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<Optimization>MaxSpeed</Optimization>
112112
<FunctionLevelLinking>true</FunctionLevelLinking>
113113
<IntrinsicFunctions>true</IntrinsicFunctions>
114-
<PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
114+
<PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115115
<SDLCheck>true</SDLCheck>
116116
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
117117
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -163,7 +163,7 @@
163163
<Optimization>MaxSpeed</Optimization>
164164
<FunctionLevelLinking>true</FunctionLevelLinking>
165165
<IntrinsicFunctions>true</IntrinsicFunctions>
166-
<PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
166+
<PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
167167
<SDLCheck>true</SDLCheck>
168168
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
169169
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎build_msvc/bitcoin-tx/bitcoin-tx.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<Optimization>MaxSpeed</Optimization>
115115
<FunctionLevelLinking>true</FunctionLevelLinking>
116116
<IntrinsicFunctions>true</IntrinsicFunctions>
117-
<PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117+
<PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118118
<SDLCheck>true</SDLCheck>
119119
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
120120
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -166,7 +166,7 @@
166166
<Optimization>MaxSpeed</Optimization>
167167
<FunctionLevelLinking>true</FunctionLevelLinking>
168168
<IntrinsicFunctions>true</IntrinsicFunctions>
169-
<PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169+
<PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
170170
<SDLCheck>true</SDLCheck>
171171
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
172172
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<Optimization>MaxSpeed</Optimization>
133133
<FunctionLevelLinking>true</FunctionLevelLinking>
134134
<IntrinsicFunctions>true</IntrinsicFunctions>
135-
<PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135+
<PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136136
<SDLCheck>true</SDLCheck>
137137
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
138138
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -184,7 +184,7 @@
184184
<Optimization>MaxSpeed</Optimization>
185185
<FunctionLevelLinking>true</FunctionLevelLinking>
186186
<IntrinsicFunctions>true</IntrinsicFunctions>
187-
<PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
187+
<PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
188188
<SDLCheck>true</SDLCheck>
189189
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
190190
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎build_msvc/bitcoind/bitcoind.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<Optimization>MaxSpeed</Optimization>
114114
<FunctionLevelLinking>true</FunctionLevelLinking>
115115
<IntrinsicFunctions>true</IntrinsicFunctions>
116-
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116+
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117117
<SDLCheck>true</SDLCheck>
118118
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
119119
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -136,7 +136,7 @@
136136
<Optimization>MaxSpeed</Optimization>
137137
<FunctionLevelLinking>true</FunctionLevelLinking>
138138
<IntrinsicFunctions>true</IntrinsicFunctions>
139-
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
139+
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
140140
<SDLCheck>true</SDLCheck>
141141
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
142142
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎build_msvc/libbitcoin_cli/libbitcoin_cli.vcxproj.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<Optimization>MaxSpeed</Optimization>
9898
<FunctionLevelLinking>true</FunctionLevelLinking>
9999
<IntrinsicFunctions>true</IntrinsicFunctions>
100-
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100+
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
101101
<SDLCheck>true</SDLCheck>
102102
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
103103
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -146,7 +146,7 @@
146146
<Optimization>MaxSpeed</Optimization>
147147
<FunctionLevelLinking>true</FunctionLevelLinking>
148148
<IntrinsicFunctions>true</IntrinsicFunctions>
149-
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149+
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150150
<SDLCheck>true</SDLCheck>
151151
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
152152
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<Optimization>MaxSpeed</Optimization>
128128
<FunctionLevelLinking>true</FunctionLevelLinking>
129129
<IntrinsicFunctions>true</IntrinsicFunctions>
130-
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
130+
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131131
<SDLCheck>true</SDLCheck>
132132
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;..\..\src\secp256k1\include;</AdditionalIncludeDirectories>
133133
<SuppressStartupBanner>false</SuppressStartupBanner>
@@ -149,7 +149,7 @@
149149
<Optimization>MaxSpeed</Optimization>
150150
<FunctionLevelLinking>true</FunctionLevelLinking>
151151
<IntrinsicFunctions>true</IntrinsicFunctions>
152-
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
152+
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
153153
<SDLCheck>true</SDLCheck>
154154
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;..\..\src\secp256k1\include;</AdditionalIncludeDirectories>
155155
<SuppressStartupBanner>false</SuppressStartupBanner>

‎build_msvc/libbitcoin_crypto/libbitcoin_crypto.vcxproj.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<Optimization>MaxSpeed</Optimization>
120120
<FunctionLevelLinking>true</FunctionLevelLinking>
121121
<IntrinsicFunctions>true</IntrinsicFunctions>
122-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
122+
<PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123123
<SDLCheck>true</SDLCheck>
124124
<AdditionalIncludeDirectories>..\..\src</AdditionalIncludeDirectories>
125125
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -138,7 +138,7 @@
138138
<Optimization>MaxSpeed</Optimization>
139139
<FunctionLevelLinking>true</FunctionLevelLinking>
140140
<IntrinsicFunctions>true</IntrinsicFunctions>
141-
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141+
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
142142
<SDLCheck>true</SDLCheck>
143143
<AdditionalIncludeDirectories>..\..\src</AdditionalIncludeDirectories>
144144
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@
873873
<Optimization>Disabled</Optimization>
874874
<FunctionLevelLinking>true</FunctionLevelLinking>
875875
<IntrinsicFunctions>false</IntrinsicFunctions>
876-
<PreprocessorDefinitions>_X86_;WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
876+
<PreprocessorDefinitions>_X86_;WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
877877
<SDLCheck>true</SDLCheck>
878878
<AdditionalIncludeDirectories>.\GeneratedFiles;..\..\src;..\..\src\univalue\include;.\QtGenerated\mocheaders</AdditionalIncludeDirectories>
879879
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -922,7 +922,7 @@
922922
<Optimization>MaxSpeed</Optimization>
923923
<FunctionLevelLinking>true</FunctionLevelLinking>
924924
<IntrinsicFunctions>true</IntrinsicFunctions>
925-
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
925+
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
926926
<SDLCheck>true</SDLCheck>
927927
<AdditionalIncludeDirectories>.\GeneratedFiles;..\..\src;..\..\src\univalue\include;.\QtGenerated\mocheaders</AdditionalIncludeDirectories>
928928
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎build_msvc/libbitcoin_util/libbitcoin_util.vcxproj.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<Optimization>MaxSpeed</Optimization>
133133
<FunctionLevelLinking>true</FunctionLevelLinking>
134134
<IntrinsicFunctions>true</IntrinsicFunctions>
135-
<PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135+
<PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136136
<SDLCheck>true</SDLCheck>
137137
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
138138
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -156,7 +156,7 @@
156156
<Optimization>MaxSpeed</Optimization>
157157
<FunctionLevelLinking>true</FunctionLevelLinking>
158158
<IntrinsicFunctions>true</IntrinsicFunctions>
159-
<PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
159+
<PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160160
<SDLCheck>true</SDLCheck>
161161
<AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories>
162162
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

0 commit comments

Comments
 (0)