1
0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Commit Graph

209 Commits

Author SHA1 Message Date
陈俊嘉
42e3add6a1
BUILD: a couple of cmake msvc compile fixes (#10799)
* cmake: a couple of msvc compile fixes

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.

* Fix some typos
2021-09-11 23:55:53 +02:00
polar
ee6e4c493d
BUILD: Refactor wolfssl submodule (#10780) 2021-09-01 09:58:05 +02:00
Justin Lewis
ae491f04a1
Fixes build issue with LLVM on Windows with cmake (#10776)
LLVM fails to build on Windows with C++ 20 standard.  When building LLVM
on Windows, we use C++ 14 already.  This commit changes the c++ standard
to be picked by each subdirectory rather than the standard being picked
by the root level cmake file.
2021-08-31 11:07:49 +01:00
陈俊嘉
4b2f56e035
Checkout wolfssl to v4.8.1-stable. (#10732)
* Checkout wolfssl to v4.8.1-stable.
Some CMake config fixes for wolfssl.

* Remove unnecessary wolfssl config.
2021-08-24 08:10:28 +01:00
polar
d84d82c166
BUILD: Refactor yaml-cpp submodule (#10745)
* moved yaml-cpp files into seperate directory
2021-08-24 06:39:26 +01:00
Lctrs
24d7374a22
support building with system faudio 21.08+ (#10708) 2021-08-15 20:37:05 +01:00
kd-11
d0a824996b vk: Add basic support for FSR 1.0
- Only implemented for image upscaling.
- Disabled by default. Emulators cannot ensure upscalers are injected at the right rendering step.
- GUI integration not implemented.
2021-08-06 17:18:48 +03:00
polar
fdc9619e7c
Fixed issue with SDL2 version sometimes casuing build failure (#10599) 2021-07-22 03:11:03 +01:00
p01arst0rm
1d85c9d201 fix shared FAudio build 2021-07-21 00:24:28 +02:00
p01arst0rm
3a026a7dc3 system faudio fix 2021-07-21 00:24:28 +02:00
ZeeWanderer
6250e478f4 [MSVC] glslang fix + vs2022 fixes
- glslang - fixed wrong path to common props
 - emucore - fixed for VS2022, its a 64 bit app now
 - common_default.props - use C++20 standard for VS2022 and further
2021-07-17 02:52:03 +02:00
Ani
15ae06a7c4 SPIRV-Tools: Revert to 2020.4
Currently not being used, could eventually be removed
2021-07-14 19:51:36 +01:00
Ani
2f361e94dd SPIRV-Tools: Update from 2020.4 to 2020.5 2021-07-14 10:43:16 +01:00
Ani
b164345561 glext: Update from 2020.04.23 to 2021.04.20 2021-07-14 10:43:16 +01:00
Ani
3cc212940c stb_truetype: Update from 1.24 to 1.25 2021-07-14 10:43:16 +01:00
Ani
2aec81330b stb_image: Update from 2.26 to 2.27 2021-07-14 10:43:16 +01:00
Ani
f16b387ad9 curl: Update from 7.76.1 to 7.77.0 2021-07-14 10:43:16 +01:00
Ani
0a6968cfe5 glslang: Update from 11.4.0 to 11.5.0 2021-07-14 10:43:16 +01:00
Ani
8f19d11f29 FAudio: Update from 21.04 to 21.07 2021-07-14 10:43:16 +01:00
polar
285b9dad83
Refactor faudio submodule (#10397)
* updated bad header import
* added faudio shared library option
2021-07-08 21:31:45 +02:00
Megamouse
d0c4b2de9f Rebase hidapi 2021-06-09 23:35:06 +02:00
Eladash
2169e8d935 Implement serialization.hpp, remove cereal submodule
Bump RSX capture version, use new serializer.
2021-06-07 16:28:42 +03:00
polar
6c44664c19
BUILD: Refactor zlib submodule (#10393) 2021-06-02 07:33:50 +02:00
Zion Nimchuk
0fc3e5fa1e Explicitely include CMakeDependantOption for CMAKE_DEPENDANT_OPTION 2021-06-01 16:41:57 +01:00
polar
b8b5b93b63
BUILD: Refactor spirv submodule (#10384)
* relocated SPIRV files

* updated gitmodule paths for Vulkan submodules

* cleaned up Vulkan child builds

* updated gitignore
2021-06-01 09:53:58 +02:00
Ani
a49446c9e9
Replace gsl::span for std::span (c++20) (#7531)
* Replace gsl::span for std::span (c++20)
* Replace gsl::byte with std::byte

Co-authored-by: Bevan Weiss <bevan.weiss@gmail.com>
2021-05-30 17:10:46 +03:00
polar
7c7cc3914d
BUILD: Refactor glslang submodule (#10361)
Co-authored-by: Megamouse <studienricky89@googlemail.com>
2021-05-29 09:47:51 +03:00
polar
177933e212
Refactor hidapi submodule (#10346)
Co-authored-by: Megamouse <studienricky89@googlemail.com>
2021-05-26 22:03:53 +03:00
Emmanuel Gil Peyrot
7398200980 3rdparty: Add option to build against system xxhash
Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
2021-05-17 20:29:13 +02:00
Emmanuel Gil Peyrot
8ed42410bf 3rdparty: Add option to build against system pugixml
Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
2021-05-17 20:29:13 +02:00
Emmanuel Gil Peyrot
8f271861f5 3rdparty: Add option to build against system flatbuffers
Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
2021-05-17 20:29:13 +02:00
Emmanuel Gil Peyrot
f6a70e2e08 3rdparty: Fix building with system wolfssl
It only installs a .pc file and nothing cmake, so we can use pkg-config
instead.

https://github.com/wolfSSL/wolfssl/pull/4043 is required when building
wolfssl against gcc 11.

Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
2021-05-17 20:29:13 +02:00
polar
11bace8804
BUILD: Move buildfiles & improved prop includes (#10251)
* moved buildfiles to subdirectory

* fix msvc build

* fix cmake build
2021-05-15 20:20:12 +02:00
polar
ce94a4ecea
BUILD: Refactor libpng submodule (#10238)
* relocate libpng files

* fix cmake build

* fix MSVC build
2021-05-07 10:07:42 +02:00
Zion
a043e95d24
Remove libopengl.so.0 hack, and use LEGACY CMake OpenGL option for AppImage builds (#10234) 2021-05-07 03:14:31 +01:00
p01arst0rm
35ee550171 changed discord-rpc to discordRPC 2021-05-04 01:27:41 +02:00
p01arst0rm
f27325fd98 relocated openal cmake 2021-05-04 01:27:41 +02:00
p01arst0rm
2447fdb90d relocated stblib files 2021-05-04 01:27:41 +02:00
p01arst0rm
7ab13a44d7 relocated discord-rpc cmake 2021-05-04 01:27:41 +02:00
p01arst0rm
1745c8c607 changed USE_SYS_LIBUSB to USE_SYSTEM_LIBUSB 2021-05-04 01:27:41 +02:00
p01arst0rm
c6c5faa95c buildsystem refactoring cleanup 2021-05-03 08:01:25 +02:00
polar
df39bac449
BUILD: Refactor asmjit submodule (#10230)
* relocated asmjit files

* fix cmake build

* fix MSVC build
2021-05-02 19:59:38 +02:00
polar
b09b0bc43b
BUILD: Refactor curl submodule (#10228)
* relocate curl files

* fix cmake build

* fix MSVC build
2021-05-01 21:56:56 +02:00
p01arst0rm
ca0d38d19d fix relative links to common_default* props 2021-05-01 18:38:42 +02:00
polar
b62ac7a046
BUILD: Refactor 7zlib (#10222)
* relocate 7z files

* fix MSVC build

* fix cmake build
2021-05-01 18:07:28 +02:00
Megamouse
ba35619718 curl: fix visual studio build 2021-04-30 17:07:05 +01:00
Ani
d17784b231 curl: Update from v7.72.0 to v7.76.1 2021-04-30 17:07:05 +01:00
Ani
18e1b45388 stblib: Update stb_truetype from v1.21 to v1.24 2021-04-30 17:07:05 +01:00
Ani
9b083f801c stblib: Update stb_image from v2.22 to v2.26 2021-04-30 17:07:05 +01:00
Ani
f0907d6f96 pugixml: Update from v1.9-git to v1.11.4 2021-04-30 17:07:05 +01:00
Ani
f9d52ea5b9 OpenAL: Update include from 1.20.1 to 1.21.1 2021-04-30 00:02:08 +01:00
Ani
e192869e15 XAudio2: Update from 1.2.0 to 1.2.6
Microsoft.XAudio2.Redist 1.2.0 to 1.2.6
2021-04-30 00:02:08 +01:00
Ani
f1be9bbf6c FAudio: Update from 20.03-git to 21.04 2021-04-30 00:02:08 +01:00
polar
dece8a69f6
BUILD: Refactor libusb submodule (#10169)
* relocate module files
* fix cmake errors
* moved & updated libusb MSVC build file
2021-04-29 16:50:18 +01:00
p01arst0rm
896db3806d replaced CMAKE_COMPILER_IS_GNUCXX with CMAKE_CXX_COMPILER_ID 2021-04-17 15:54:27 +03:00
xddxd
7cbafd603a
Get rid of non-LLVM build configurations (#10030)
Co-authored-by: Megamouse <studienricky89@googlemail.com>
2021-03-29 22:45:48 +03:00
Megamouse
a7c9827ad4
Improve cellScreenshot (#9851)
* Fix screenshot logging

* Update libpng to 1.6.37

* cellScreenshot: Write text chunks
* cellScreenshot: add overlay image
* screenshot_manager: add /dev_hdd0/photo/

* read_png_file: use deleter instead of manual close

* cellScreenshot: use Qt for overlays
* cellScreenshot: don't apply overlay to regular img
* screenshot_manager: add mount hack for VFS
* cellScreenshot: escape the whole path
2021-02-28 22:05:04 +03:00
kd-11
5a049d41fd gpu-open/vma: Optimize CheckAllocation method
- Avoids doing useless work. The scanning algorithm is painfully slow on hardware with alignment requirement > 1
- Upto 50ms saved for ~600 allocations when many small allocations exist
2021-02-10 11:37:14 +03:00
Alex James
c06707c891 CMake: Unset LIBUSB_LIBRARIES when using libusb submodule
If the system has libusb installed but USE_SYS_LIBUSB is false, the
static libusb will link against the system libusb (as pkg_check_modules
sets LIBUSB_LIBRARIES, and 3rdparty/libusb_cmake/libusb.cmake links the
usb-1.0-static target with LIBUSB_LIBRARIES). Unset LIBUSB_LIBRARIES to
avoid this when using the libusb submodule.
2021-01-17 13:51:03 +03:00
Alex James
d7a8d385d8 CMake: Use find_package to find SDL2
This ensures that the SDL2 uses an absolute library path, which is
necessary when SDL2 isn't present in the default link directories (e.g.
on macOS).
2021-01-17 13:51:03 +03:00
JohnHolmesII
9c3e55787e CMake: Update required Qt version 2020-12-30 09:03:24 +03:00
Nekotekina
a4e28df9cf Update hidapi 2020-11-17 15:40:09 +03:00
Nekotekina
1b8bf081b5 Upgrade to LLVM 11 Stable 2020-11-02 21:23:25 +03:00
Bevan Weiss
a0d95a823e
BUGFIX: LibUSB Transfer list deletion (#9084)
It looks like I was too hasty in picking the latest libusb commit (to fix a few Windows build warnings) prior to landing my merged PR.
libusb commit eee6998 had a transfer list bug.  Have just tested on c33990a and it's resolved now.
2020-10-17 13:41:59 +01:00
Bevan Weiss
1e83d2a4e9 LibUSB: Update to upstream master (and turn off YAML_CPP_INSTALL CMake property)
May resolve some outstanding issues around libusb/hidapi (i.e. DS4 not being released on rpcs3 shutdown etc..) or may not.
Fixes three outstanding compile warnings on non-Windows OS... introduces a few more warnings in WindowsOS (issue raised upstream with libusb around WINAPI_CHECK macro)
Re-ordered the 3rd party CMake so libusb is in file order above hidapi (just to have document flow match logical flow)

Also took this opportunity to remove the YAML INSTALL action (by setting YAML_CPP_INSTALL to OFF)
Provided capability to use system library for libusb by providing USE_SYS_LIBUSB option to CMAKE

Tested under:
- [X] Windows 10 2004 OS with DS4 controller
- [X] Windows 10 2004 OS with GCon3 controller
- [X] Linux (Mint 20) with DS4 controller
2020-10-16 22:51:52 +03:00
Bevan Weiss
d962bb018d wolfssl: Add WC_NO_HARDEN suppression to compiler defines, and remove duplicate defines in MSVC
Silence the wolf from telling us:
#warning "For timing resistance / side-channel attack prevention consider using harden options"

Also removed duplicate defines for Visual Studio project, to remove some additional warnings there.
2020-10-10 13:57:24 +03:00
Bevan Weiss
264df11132
xxHash: Update to v0.8.0 xxHash (#8980)
* xxHash: Update to v0.8.0 xxHash

Removed build of XXHSUM test application for xxHash also.
2020-09-27 01:10:31 +01:00
RipleyTom
54493747a8 Updates wolfssl and curl to official repos 2020-09-10 23:09:36 +02:00
RipleyTom
190822c2b2
RPCN Client (#8663) 2020-08-27 20:47:04 +01:00
Bevan Weiss
a11afe05bf MSVC changes
Add support for compilation on x64 toolchain (x86 cl.exe was running out of heap space in vm.cpp)

Also took the opportunity to change compile optimisation from /Ox to /O2, as /O2 provides better optimisation than does /Ox

Also, we shouldn't be explicitely setting compiler tool defines (__cpp_lib_bitops), so remove that from types.h
2020-08-14 18:34:34 +01:00
AniLeo
d4333788e2 glext.h: update from 20180114 to 20200423
Include newly added khrplatform.h as well
2020-05-16 08:29:00 +01:00
kd-11
fb3d5827f0 Fix linux build 2020-05-05 13:18:03 +03:00
Dzmitry Malyshau
b6e52ad975 Fix CMake path to IOKit 2020-04-06 23:23:11 +03:00
Jan Beich
58492ef92d
build/cmake: add option to use system-wide libcurl package (#7882) 2020-03-28 00:49:31 +00:00
Maxim Kulyk
30a8cadf60 [MSVC] Remove unnecessary configurations and properly fix curl 2020-03-26 15:56:40 +03:00
Maxim Kulyk
ec4287cbd3 static RT 2020-03-26 15:21:53 +03:00
Maxim Kulyk
e58fa7d51f Fix curl 2020-03-26 15:21:53 +03:00
Maxim Kulyk
d26c465911 [MSVC] Move libcurl and wolfssl project files
libcurl and wolfssl were moved to rpcs3 source control to make buildsystem changes easier.

common_default.props and common_default_macros.props included to project files.
Int and Out Dirs changed to default:
<OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>   <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
2020-03-26 15:21:53 +03:00
RipleyTom
af4efafae1 Remove Qt5Network Qt5OpenGL and Qt5QML dependencies 2020-03-22 13:48:43 +03:00
RipleyTom
b1d8bf754e Replace QNetwork operations with libcurl + wolfssl 2020-03-22 13:48:43 +03:00
Nekotekina
04dedb17eb Disable exception handling.
Use -fno-exceptions in cmake.
On MSVC, enable _HAS_EXCEPTION=0.
Cleanup throw/catch from the source.
Create yaml.cpp enclave because it needs exception to work.
Disable thread_local optimizations in logs.cpp (TODO).
Implement cpu_counter for cpu_threads (moved globals).
2020-03-12 16:03:08 +03:00
Nekotekina
5b0476e772 Update LLVM to new llvm-mirror (LLVM 11)
Use clang-cl to build LLVM on Windows.
2020-03-03 18:33:02 +03:00
RipleyTom
4befa36365 Use official libusb repo 2020-02-22 16:02:40 +03:00
Silent
312fc94daa Replace XAudio2 implementation with an unified Xaudio2Redist
This removes dual implementation for 2.7 and 2.8/2.9 interfaces
and also removes reliance on DirectX End User Runtimes for Windows 7.
2020-02-20 23:33:09 +03:00
Zion Nimchuk
aa9055f4c3 Switch the AppImage building over to gcc from clang
Turns out the current version of clang doesn't support the [[likely]] and [[unlikely]] attributes, so to ensure good performance, we'll be switching to gcc, at least for now.
2020-02-19 21:16:32 +03:00
Zion Nimchuk
9d1833c5a8 Bump FAudio depedency, set FAudio to build statically, enable FAudio in the build script 2020-02-19 21:16:32 +03:00
AniLeo
b96f064868 OpenAL: Update to 1.20.1 2020-02-19 21:15:12 +03:00
Zion Nimchuk
896d16ec7b Bump minimum Qt5 version to 5.14.0 in CMake 2020-02-10 21:46:35 +03:00
Silent
aeebcfe141 Fix Debug - LLVM in VS project files 2020-01-31 11:23:55 +03:00
MSuih
ca52c1e2d1 Link Bcrypt with ffmpeg 2020-01-03 21:45:09 +03:00
Nekotekina
2c4ecc55af Update ffmpeg 2020-01-02 00:53:22 +03:00
kd-11
33f7d23571 3rdparty: Update vulkan memory allocator (GPUOpen) 2019-12-30 23:53:10 +03:00
scribam
e735346d26 cmake: Set LLVM_INCLUDE_BENCHMARKS to OFF 2019-11-25 23:08:37 +03:00
Emmanuel Gil Peyrot
7e4d142682 Remove GSL as we don’t use it anymore 2019-11-09 19:30:06 +01:00
Emmanuel Gil Peyrot
25144caf12 Add tcbrindle’s span implementation 2019-11-09 19:30:06 +01:00
Max
8c3d2363bf [msbuild] 7zlib msbuild changes
- move project file to 3rdparty for consistency
 - add common_default props
 - fixes 7zlib.vcxproj.FileListAbsolute.txt being detected as change
2019-10-28 18:59:16 +03:00
msuih
a4d8cab67e Qt version bump
Also gives a tip about the Qt5_DIR definition.
2019-10-26 21:23:38 +03:00
Oschowa
9e753e1ffd 3rdparty: update FAudio to 19.10
and add 'ignore = dirty' to faudio submodule
2019-10-25 00:56:53 +03:00
Oschowa
d8ff7c759b 3rdparty: only build FAudio with SDL >= 2.0.9 2019-10-25 00:56:53 +03:00
Oschowa
06433d614a Implement FAudio backend (#6374) 2019-10-24 22:26:29 +03:00