Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BUILD: a couple of cmake msvc compile fixes #10799

Merged
merged 3 commits into from Sep 11, 2021
Merged

Conversation

Copy link
Contributor

@cjj19970505 cjj19970505 commented Aug 31, 2021

Throw error when using multi-config generators.
Add USE_MSVC_STATIC_CRT option for statically linking with CRT.
Set curl's CURL_STATIC_CRT aligned with USE_MSVC_STATIC_CRT.
Fix cmake configs of 7z and OpenAL in msvc build.
Remove unecessary hard coded compiling and linking flags.
Use debug option in windeployqt when configuring for a debug build.
Search for windeployqt tool in configure time.
Add vcpkg's Qt support.

This PR enables CMake build support for
Release build with both static CRT and dynamic CRT
Debug build with dynamic CRT

Throw error when using multi-config generators.
Add USE_MSVC_STATIC_CRT option for statically linking with CRT.
Set curl's CURL_STATIC_CRT aligned with USE_MSVC_STATIC_CRT.
Fix cmake configs of 7z and OpenAL in msvc build.
Remove unecessary hard coded compiling and linking flags.
Use debug option in windeployqt when configuring for a debug build.
Search for windeployqt tool in configure time.
Add vcpkg's Qt support.
@cjj19970505 cjj19970505 changed the title cmake: a couple of msvc compile fixes BUILD: a couple of cmake msvc compile fixes Aug 31, 2021
@MSuih MSuih added Build and CI OS: Windows labels Aug 31, 2021
CMakeLists.txt Outdated Show resolved Hide resolved
rpcs3/CMakeLists.txt Outdated Show resolved Hide resolved
rpcs3/CMakeLists.txt Outdated Show resolved Hide resolved
@AniLeo AniLeo requested a review from hcorion Sep 11, 2021
Copy link
Member

@hcorion hcorion left a comment

Not sure about functionality, since I don't use MSVC. but this looks good from a code perspective

@Megamouse Megamouse merged commit 42e3add into RPCS3:master Sep 11, 2021
4 checks passed
@cjj19970505 cjj19970505 deleted the cmake_win branch Dec 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build and CI OS: Windows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants