Skip to content

Commit 375b4da

Browse files
committed
switch to /MT
1 parent 8cb436f commit 375b4da

File tree

243 files changed

+3430
-24539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+3430
-24539
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
1010
cmake_policy(SET CMP0069 NEW) # needed for CMAKE_INTERPROCEDURAL_OPTIMIZATION
1111
set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
1212

13+
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
14+
1315
option(PA_ENABLE_LTO "Enable cross language linking time optimization" OFF)
1416
set(LTO_ENABLED false)
1517
if(PA_ENABLE_LTO)

ReplayParser/Analyzer/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
22
set(RUST_LIB_DIR "debug")
33
set(CARGO_BUILD_TYPE "dev")
44
if(WIN32)
5-
set(RUST_CC_ENV CFLAGS=-MDd CXXFLAGS=-MDd)
5+
set(RUST_CC_ENV CFLAGS=-MTd CXXFLAGS=-MTd)
66
endif()
77
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
88
set(RUST_LIB_DIR "release")
99
set(CARGO_BUILD_TYPE "release")
1010
if(WIN32)
11-
set(RUST_CC_ENV CFLAGS=-MD CXXFLAGS=-MD)
11+
set(RUST_CC_ENV CFLAGS=-MT CXXFLAGS=-MT)
1212
endif()
1313
elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
1414
set(RUST_LIB_DIR "release-with-debug")
1515
set(CARGO_BUILD_TYPE "release-with-debug")
1616
if(WIN32)
17-
set(RUST_CC_ENV CFLAGS=-MD CXXFLAGS=-MD)
17+
set(RUST_CC_ENV CFLAGS=-MT CXXFLAGS=-MT)
1818
endif()
1919
endif()
2020

ThirdParty/openssl/BUILD.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Debug:
2+
- set CFLAGS=/MTd
3+
- set LDFLAGS=/NODEFAULTLIB:msvcrtd.lib /NODEFAULTLIB:libucrtd.lib
4+
- perl Configure VC-WIN64A --prefix="out" --openssldir="out\ssl" no-shared -static --debug
5+
- nmake
6+
- nmake install
7+
8+
Release:
9+
- set CFLAGS=/MT /Zl
10+
- set LDFLAGS=/NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:libucrt.lib
11+
- perl Configure VC-WIN64A --prefix="out" --openssldir="out\ssl" no-shared -static --release
12+
- nmake
13+
- nmake install

ThirdParty/openssl/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ if (WIN32)
66
debug ${CMAKE_CURRENT_SOURCE_DIR}/lib/win32/libcrypto-d.lib
77
optimized ${CMAKE_CURRENT_SOURCE_DIR}/lib/win32/libcrypto.lib
88
)
9+
# target_link_libraries(OpenSSL INTERFACE Crypt32 WS2_32 GDI32 ADVAPI32 USER32)
10+
target_link_libraries(OpenSSL INTERFACE Crypt32 Bcrypt)
911
target_include_directories(OpenSSL INTERFACE include)
1012
elseif (UNIX)
1113
find_package(OpenSSL REQUIRED)

ThirdParty/openssl/include/crypto/__DECC_INCLUDE_EPILOGUE.H

Lines changed: 0 additions & 16 deletions
This file was deleted.

ThirdParty/openssl/include/crypto/__DECC_INCLUDE_PROLOGUE.H

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)