Skip to content

Commit 4f530e4

Browse files
eggrobineggrobin
committed
/MT rather than /MD for all but libprotobuf_dynamic; see mockingbirdnest/Principia#4190.
1 parent a1fc45c commit 4f530e4

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

‎vsprojects/libprotobuf-lite.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8484
<MinimalRebuild>true</MinimalRebuild>
8585
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
86-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
86+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8787
<PrecompiledHeader />
8888
<WarningLevel>Level3</WarningLevel>
8989
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -97,7 +97,7 @@
9797
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9898
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9999
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
100-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
100+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
101101
<PrecompiledHeader>
102102
</PrecompiledHeader>
103103
<WarningLevel>Level3</WarningLevel>
@@ -114,7 +114,7 @@
114114
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
115115
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
116116
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
117+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
118118
<PrecompiledHeader />
119119
<WarningLevel>Level3</WarningLevel>
120120
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -130,7 +130,7 @@
130130
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
131131
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132132
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
133+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
134134
<PrecompiledHeader>
135135
</PrecompiledHeader>
136136
<WarningLevel>Level3</WarningLevel>

‎vsprojects/libprotobuf.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8888
<MinimalRebuild>true</MinimalRebuild>
8989
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
90-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
90+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
9191
<PrecompiledHeader />
9292
<WarningLevel>Level3</WarningLevel>
9393
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -101,7 +101,7 @@
101101
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102102
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
103103
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
104-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
104+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
105105
<PrecompiledHeader>
106106
</PrecompiledHeader>
107107
<WarningLevel>Level3</WarningLevel>
@@ -118,7 +118,7 @@
118118
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
119119
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
120120
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
121-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
121+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
122122
<PrecompiledHeader />
123123
<WarningLevel>Level3</WarningLevel>
124124
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -134,7 +134,7 @@
134134
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
135135
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
136136
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
137+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
138138
<PrecompiledHeader>
139139
</PrecompiledHeader>
140140
<WarningLevel>Level3</WarningLevel>

‎vsprojects/libprotoc.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPROTOC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8484
<MinimalRebuild>true</MinimalRebuild>
8585
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
86-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
86+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8787
<PrecompiledHeader />
8888
<WarningLevel>Level3</WarningLevel>
8989
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -97,7 +97,7 @@
9797
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9898
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPROTOC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9999
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
100-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
100+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
101101
<PrecompiledHeader>
102102
</PrecompiledHeader>
103103
<WarningLevel>Level3</WarningLevel>
@@ -114,7 +114,7 @@
114114
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
115115
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
116116
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPROTOC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
117+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
118118
<PrecompiledHeader />
119119
<WarningLevel>Level3</WarningLevel>
120120
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -130,7 +130,7 @@
130130
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
131131
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132132
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPROTOC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
133+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
134134
<PrecompiledHeader>
135135
</PrecompiledHeader>
136136
<WarningLevel>Level3</WarningLevel>

‎vsprojects/lite-test.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109109
<MinimalRebuild>true</MinimalRebuild>
110110
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
111-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
111+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
112112
<PrecompiledHeader />
113113
<WarningLevel>Level3</WarningLevel>
114114
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -133,7 +133,7 @@
133133
<AdditionalIncludeDirectories>../src;.;../gtest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
134134
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135135
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
136-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
136+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
137137
<PrecompiledHeader>
138138
</PrecompiledHeader>
139139
<WarningLevel>Level3</WarningLevel>
@@ -156,7 +156,7 @@
156156
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
157157
<AdditionalIncludeDirectories>../src;.;../gtest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158158
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
159-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
159+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
160160
<PrecompiledHeader />
161161
<WarningLevel>Level3</WarningLevel>
162162
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -183,7 +183,7 @@
183183
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
184184
<AdditionalIncludeDirectories>../src;.;../gtest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
185185
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
186-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
186+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
187187
<PrecompiledHeader>
188188
</PrecompiledHeader>
189189
<WarningLevel>Level3</WarningLevel>

‎vsprojects/protoc.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8888
<MinimalRebuild>true</MinimalRebuild>
8989
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
90-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
90+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
9191
<PrecompiledHeader />
9292
<WarningLevel>Level3</WarningLevel>
9393
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -106,7 +106,7 @@
106106
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107107
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108108
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
109-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
109+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
110110
<PrecompiledHeader>
111111
</PrecompiledHeader>
112112
<WarningLevel>Level3</WarningLevel>
@@ -125,7 +125,7 @@
125125
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
126126
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127127
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
128+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
129129
<PrecompiledHeader />
130130
<WarningLevel>Level3</WarningLevel>
131131
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -146,7 +146,7 @@
146146
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
147147
<AdditionalIncludeDirectories>../src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
148148
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
149+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
150150
<PrecompiledHeader>
151151
</PrecompiledHeader>
152152
<WarningLevel>Level3</WarningLevel>

‎vsprojects/test_plugin.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
101101
<MinimalRebuild>true</MinimalRebuild>
102102
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
103-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
103+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
104104
<PrecompiledHeader />
105105
<WarningLevel>Level3</WarningLevel>
106106
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -125,7 +125,7 @@
125125
<AdditionalIncludeDirectories>../src;.;../gtest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
126126
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127127
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
128-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
128+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
129129
<PrecompiledHeader>
130130
</PrecompiledHeader>
131131
<WarningLevel>Level3</WarningLevel>
@@ -148,7 +148,7 @@
148148
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
149149
<AdditionalIncludeDirectories>../src;.;../gtest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
150150
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
151-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
151+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
152152
<PrecompiledHeader />
153153
<WarningLevel>Level3</WarningLevel>
154154
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -175,7 +175,7 @@
175175
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
176176
<AdditionalIncludeDirectories>../src;.;../gtest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
177177
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
178-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
178+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
179179
<PrecompiledHeader>
180180
</PrecompiledHeader>
181181
<WarningLevel>Level3</WarningLevel>

‎vsprojects/tests.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109109
<MinimalRebuild>true</MinimalRebuild>
110110
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
111-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
111+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
112112
<PrecompiledHeader />
113113
<WarningLevel>Level3</WarningLevel>
114114
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -133,7 +133,7 @@
133133
<AdditionalIncludeDirectories>../src;.;../gtest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
134134
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135135
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
136-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
136+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
137137
<PrecompiledHeader>
138138
</PrecompiledHeader>
139139
<WarningLevel>Level3</WarningLevel>
@@ -156,7 +156,7 @@
156156
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
157157
<AdditionalIncludeDirectories>../src;.;../gtest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158158
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
159-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
159+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
160160
<PrecompiledHeader />
161161
<WarningLevel>Level3</WarningLevel>
162162
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -183,7 +183,7 @@
183183
<AdditionalOptions>/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions)</AdditionalOptions>
184184
<AdditionalIncludeDirectories>../src;.;../gtest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
185185
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
186-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
186+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
187187
<PrecompiledHeader>
188188
</PrecompiledHeader>
189189
<WarningLevel>Level3</WarningLevel>

0 commit comments

Comments
 (0)