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

Replace QNetwork operations with libcurl + wolfssl #7771

Merged
merged 4 commits into from
Mar 22, 2020

Conversation

RipleyTom
Copy link
Contributor

@RipleyTom RipleyTom commented Mar 13, 2020

closes #7575

rpcs3/rpcs3qt/game_compatibility.cpp Outdated Show resolved Hide resolved
rpcs3/rpcs3qt/game_compatibility.cpp Outdated Show resolved Hide resolved
rpcs3/rpcs3qt/game_compatibility.cpp Outdated Show resolved Hide resolved
rpcs3/rpcs3qt/update_manager.cpp Outdated Show resolved Hide resolved
rpcs3/rpcs3qt/update_manager.cpp Outdated Show resolved Hide resolved
Copy link
Member

@MSuih MSuih left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's some stuff that'll fix the most oblivous errors on windows side. It still won't compile even with these fixed due to don't know how to make '3rdparty\wolfssl_cmake\wolfssl.lib', but I think that'll get sorted out once you fix the linux build.

You need to define NOMINMAX, either for whole project in ConfigureCompiler or for the files which use libcurl. If you define it for whole project, remove it from stdafx.h to avoid multiple definition spam.

3rdparty/wolfssl_cmake/CMakeLists.txt Outdated Show resolved Hide resolved
3rdparty/wolfssl_cmake/CMakeLists.txt Outdated Show resolved Hide resolved
rpcs3/rpcs3qt/game_compatibility.cpp Outdated Show resolved Hide resolved
rpcs3/rpcs3qt/game_compatibility.h Outdated Show resolved Hide resolved
@RipleyTom RipleyTom force-pushed the curlification branch 3 times, most recently from 5ee8ebe to 82ee6e4 Compare March 15, 2020 19:15
rpcs3/rpcs3qt/update_manager.cpp Outdated Show resolved Hide resolved
rpcs3/rpcs3qt/update_manager.cpp Outdated Show resolved Hide resolved
rpcs3/rpcs3qt/game_compatibility.cpp Outdated Show resolved Hide resolved
rpcs3/rpcs3qt/update_manager.cpp Outdated Show resolved Hide resolved
@RipleyTom RipleyTom force-pushed the curlification branch 7 times, most recently from 278b24a to af1fbbe Compare March 19, 2020 19:24

#define NOMINMAX
#define CURL_STATICLIB
#include <curl/curl.h>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CURL probably can be declared as a forward declaration under extern "C"{}, with an actual include in cpp file.

@Megamouse Megamouse added the GUI label Mar 21, 2020
@RipleyTom RipleyTom force-pushed the curlification branch 2 times, most recently from d766e3a to db81b77 Compare March 21, 2020 15:35
@Nekotekina Nekotekina marked this pull request as ready for review March 21, 2020 19:35
@RipleyTom RipleyTom force-pushed the curlification branch 3 times, most recently from 63c8f62 to ad9ac27 Compare March 22, 2020 00:34
}
}

// Parse expression(or at least used to, was nuked to remove the need for QtJsEngine)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Press F to pay respects.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

F

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// F 

@Nekotekina Nekotekina merged commit af4efaf into RPCS3:master Mar 22, 2020
@RipleyTom RipleyTom deleted the curlification branch March 27, 2020 02:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OpenSSL broken on the Linux Appimage
7 participants