* 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
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.
- Only implemented for image upscaling.
- Disabled by default. Emulators cannot ensure upscalers are injected at the right rendering step.
- GUI integration not implemented.
- 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
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>
- 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
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.
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.
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
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.
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
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>
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).
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.
- Added support for current default toolset, explitly specified c++17 standard and 8.1 win sdk.
- properties were defined via `common_default.props` and `common_default_macros.props`
Note: There are 2 files because some properties need to be imported before `Microsoft.Cpp.Default.props` , but other common properties can be imported after but they require marco defined in `Microsoft.Cpp.Default.props`.
- Added hidapi and libusb project files to repository to simplify msbuild changes.
* CMake: Refactor build to multiple libraries
- Refactor CMake build system by creating separate libraries for
different components
- Create interface libraries for most dependencies and add 3rdparty::*
ALIAS targets for ease of use and use them to try specifying correct
dependencies for each target
- Prefer 3rdparty:: ALIAS when linking dependencies
- Exclude xxHash subdirectory from ALL build target
- Add USE_SYSTEM_ZLIB option to select between using included ZLib and
the ZLib in CMake search path
* Add cstring include to Log.cpp
* CMake: Add 3rdparty::glew interface target
* Add Visual Studio CMakeSettings.json to gitignore
* CMake: Move building and finding LLVM to 3rdparty/llvm.cmake script
- LLVM is now built under 3rdparty/ directory in the binary directory
* CMake: Move finding Qt5 to 3rdparty/qt5.cmake script
- Script has to be included in rpcs3/CMakeLists.txt because it defines
Qt5::moc target which isn't available in that folder if it is
included in 3rdparty directory
- Set AUTOMOC and AUTOUIC properties for targets requiring them (rpcs3
and rpcs3_ui) instead of setting CMAKE_AUTOMOC and CMAKE_AUTOUIC so
those properties are not defined for all targets under rpcs3 dir
* CMake: Remove redundant code from rpcs3/CMakeLists.txt
* CMake: Add BUILD_LLVM_SUBMODULE option instead of hardcoded check
- Add BUILD_LLVM_SUBMODULE option (defaults to ON) to allow controlling
usage of the LLVM submodule.
- Move option definitions to root CMakeLists
* CMake: Remove separate Emu subtargets
- Based on discussion in pull request #5032, I decided to combine
subtargets under Emu folder back to a single rpcs3_emu target
* CMake: Remove utilities, loader and crypto targets: merge them to Emu
- Removed separate targets and merged them into rpcs3_emu target as
recommended in pull request (#5032) conversations. Separating targets
probably later in a separate pull request
* Fix relative includes in pad_thread.cpp
* Fix Travis-CI cloning all submodules needlessly
GNU libc and musl have aligned_alloc() in <stdlib.h> while on BSDs
<malloc.h> shouldn't be used.
In file included from rpcs3/Emu/RSX/VK/VKMemAlloc.cpp:2:
In file included from rpcs3/../3rdparty/GPUOpen/include/vk_mem_alloc.h:2233:
/usr/include/malloc.h:3:2: error: "<malloc.h> has been replaced by <stdlib.h>"
#error "<malloc.h> has been replaced by <stdlib.h>"
^
* Fix windows build. I made sure to do everything with a win32 prefix to not effect linux build.
* Make the window resizable instead of fixed in the corner.
* Ignore moc files and things in the debug/release folder. I might also ignore rpcs3qt.vcxproj and its filters as they're autogenerated by importing the qt project file. But, this helps clean out clutter for now.
* Add cmake. This doesn't interact with the rest of rpcs3 nor the main cmake file. That's the next thing I'm doing. I'll probably need to modify them so it'll take me time to figure out. But, this will build rpcs3qt on linux and build as is with using qt.
* The build works. I'd like to thank my friends, Google and Stackoverflow.
Setted up by importing rpcs3Qt project using Qt's visual studio plugin.
* Cleanup. Remove all the stuff in the rpcs3qt folder as its incorporated elsewhere. Remove the rpcs3qt project file as its now built into the solution and cmake doesn't care about pro files.
* Update readme to reflect getting Qt.
* Remove wxwidgets as submodule and add zlib instead. Wxwidgets was our old way of having zlib. I also added build dependencies to rpcs3qt so you should no longer get link errors on the first clean rebuild.
* Add rpcs3_version, few GUI tweaks
* Set defaultSize to 70% of screen size
* Add the view menu (#3)
* Added the view menu with the corresponding elements. Now, the debugger/log are hidden by default. The view menu has a checkbox which you click to show/hide the dock widgets.
* Make log visible by default
* Improve UI by making it into a checkbox that's easier to use.
* fix qt build for vs2017 (seems to work fine in 2015 with plugin but needs testing by other users)
* updated readme for qt
* update appveyor for qt
- cleaned formatting for the post build command
* fix build (#6)
* fix build legit this time i promise
* [Ready] Gamepadsettings (#4)
* WIP Gamepadsettings
pushbutton Eventhandling missing
* GamepadSettings should work except for cfg Init
Some KeyInputs are missing
* Update padsettingsdialog.h
* Update padsettingsdialog.cpp (#5)
* Update padsettingsdialog.cpp
removed silly tabs
* Update padsettingsdialog.cpp
* GetKeyCode simplified
* rename pad settings to keyboard settings o.O
* rename keyboard setting to input settings
* Remvoed the QT_UI defines.
* Readded new line at end of file. Replaced define in padsettings with constant.
* GUI fixes (Settings)
* Stub the logger UI. Nothing special besides a simple stub.
* Unstub the log. I haven't tested TTY but it should work.
Only thing to do, but this is in general, is add persistent settings.
* Minor refactoring to simplify code.
* Fix image loading. I'm 90% sure it works because it loads the path as expected and that's the same format I used in my gamelist implementation for the images.
* Made game lists much more functional than it was.
* mainwindow
* gamelist
* Please forgive me for I have lambdaed.
Added the ability to toggle showing columns via a context menu.
* Fix GameList further
* sort by name on init fixed
* Created the baseline refactoring. I'm going to start working on the callbacks now. May need to implement other classes in the process. Fun stuff, I know.
* adds InstallPkg (tested) and InstallPup (should work but makes unknown shenanigans) implementation
adds RefreshGameList
obliterates 10sec Refresh
* messages
* Rpcs3 gs frame (#16)
* Messing with project settings try to get trails of cold steel to boot.bluh
Definitely one change is needed in linker settings for RPCS3 to not crash immediately.
Can't even see how horribly botched my implementation of GSFrame is because we aren't booting lol. Something is gone awry with elf.
* remove random ! not that it matters much right now
* minor additions
* "Working" with debug mode though you have to ignore an assert reached from Qt. Qt is upset that the rsx thread is calling stuff on the UI thread despite not owning it. However, I can't do a thing to change that atm. (The fix would be to do what the TODO says in System.cpp-- making gsframe and stuff get initialized via system call)
Crashes due to needing pad callback to be done.
* With this build in debug mode, Trails of Cold steel will get FPS. (caveat. You have to ignore when Qt throws a debug assert lol)
* Fix release mode. Fix the Qt debug assert by using ancient occault rituals. I want to be able to remove the blocking connects but it won't work right now without it. It isn't perfect but it's good enough for now IMO.
* Add enters to the end of files.
* Removing target and setting source of events to be the application instead of the main window. The main window isn't the game window, and I don't really know what widget will be targetted for the game event. Works, though, it's admittedly probably not optimal by ANY means.
* Fix comment.
* Fix libpng wit zlib.
* Move Qt GUI into RPCS3Qt. (#17)
Restore wx GUI.
* fix install-progressdialogs randomly not showing
* install-progressdialog cosmetics
* add stylesheet file loading
* apply request
* Add stylesheet to git ignore.
* XInput..
* Joystick...
* Rpcs3 qt small fixes (#20)
* Small fixes. Have emulator stop when x button is pressed on game window. Have emulator/application stop when the main window is closed.
* If I forget another new line ending for a file.............................................
* Add CgDisasm (#21)
* fix install-progressdialogs randomly not showing
* install-progressdialog cosmetics
* add stylesheet file loading
* apply request
* add CgDisasm
add code to disable contextmenu options
fix gamelist issue
* missing proj changes
* Add ability to open stylesheets from menu.
* Mega searcher (#23)
* add MemoryStringSearcher
set minimum Sizes for mainwindow and CgDisasm
* minor fixes
* Since the system.cpp callbacks for emulator state were unused, I removed them. Then, I replaced them with callbacks for the Gui.
* added stylesheet options
setfocus on settings fixed
newline added
* added signals and slots for EmuRun and EmuStop
* update ui
update ui now works
added callback onReady
added EnableMenues
added ps3 commands
* added restart logic to menu
* newline
* event header removed
* Added graphic settings class. (#26)
* Added graphic settings class. First thing is to have the dock widgets and window size/location be stateful. Minor bug with debugger frame changing size on hide/show on default setup on second load. But, otherwise, fine. Also, the GUI doesn't update to accomodate the statefulness of the widgets. But, that'll come in time as I update this class.
* Add view debugger, logger, gamelist to settings and synchronize them.
* Separate initializing actions from connects
* Add invisible fullscreen cursor and double click event.
* Add the UI log settings.
* Add MemoryViewer (#30)
* Add Memoryviewer
Image Button crashes/not fully implemented
focus on some button annoying
minor changes for question dialogs
* GuiSettings Refactoring (#31)
* Add settings for columns shown and which one is saved
* I accidentally refactored the settings class. Added ability to reset to default GUI. Added statefulness to column widths.
* add gui tab
* Fix logging at startup.
* Preset settings.I think I ironed out MOST of the glitches. Will work on the rest of it soon. Should be a lot simpler as I won't have to use the so-called meta settings. Also, renamed all settings methods to CapitalCase.
* Removed dock widget controls.
* Added style sheets. Removed the option from the menu.
* Rewrite to use folder design. Much simpler! Yay! Simpler. Better, right?
* It's remarkable how tricky this is.
* Added convenience button to open up the settings folder in explorer
* Add newlines at end of file
* simplified logic. Fixed a bug.. hopefully not more bugs
* Fix the undocumented feature
* Make the dialog big enough to have entire text on title shown. If talkashie changes the font to size 1203482 I don't care lol
* Make warning messagebox instead of changing the title of the dialog.
* marking...
* Hcorion suggested changes.
* [WIP] autopause (#32)
* autopause added
needs fixing
headers do not show text
* fix compile stuff
* Add MsgDialog + edge widgets (#33)
* Add MsgDialog
needs magic
* add "Debugger" Buttons to menubar
* Adapt ds4 changes. I'm not sure if they work as I don't have a compatible controller. But, at the same time, it's kind of silly all I had to do was remove stdguiafx to get compilation.
* [Ready] Add KernelExplorer (#36)
* KernelExplorer added
* Fix build. Connect mainwindow to show explorer.
* qstr formatting added
hid header, fixed button size
* Taskbar Progress for install PUP/PKG (#37)
* Add Taskbar Progress for both PKG and PUP installer
* fix missing ifdefs for windows
* add mainwindow icon + thumbnail toolbar
* add game specific icons to the GSFrame
* fix icon crash
* fix appIcon's aspect ratio in SetAppIconFromPath
* Fix black borders in RGB32 icons
* rename thumbar related buttons
* EmuSettings (#35)
* Core tab done minus doing the library list.
* Graphics tab.
* Audio tab
* Input tab
* Added the other tabs
* LLE part one-- load existing libraries sorted. (I'd finish it but I'm going to look at a PR by mega)
* add search and add other libraries that aren't checked.
* Finish adding lle selecting things.
* marking my territory (#38)
fixed settingsdialog glitch and width
added groupbox to gui buttons
removed parents from layouts
* add debuggerframe + RSXDebugger (#34)
* Add Debuggerframe
* add RSXDebugger
* add RSXDebugger fo real
* RSXDebugger improved
minor adjustments
* add utf8 conversions like neko told me to
hopefully i did not utf8-ise too many things xD
* fix some variables
* maybe fix image buffers in RSXDebugger
* fixed image view (pretty sure)
* fixed image buffer (hopefully)
* QT Opengl frame (#41)
* fix RSX Debugger headers (#40)
* fix some debugger layout issues
fix RSX Debugger headers + some comments
* add kd-11's SPU options
fix D3D12 showing on non-compatible systems
tidy up coretab
* improve D3D12 behaviour in graphicstab:
adapter selection and D3D12 render won't show on non-compatible systems
add monospace font to cgDisasm
* enable update only on visibility
* Rpcs3 qt llvm build (#42)
* LLVM pushed so mega can test
* probably is what is needed with Release LLVM
* should probably have RPCS3-Qt be using release-llvm
* include zlib the same way.
* don't talk to me about how I made this happen.
* I applied the magical treatment to debug mode too. Though, it's entirely probably that doing it once in LLVM-release mode made this entirely redundant
* hack
* progress bar for LLVM spawns but doesn't close yet.
* fix msgDialog (#43)
fix oskDialog
* Minor bug fixzz
* fix osk and msgdialog for real (#44)
* fix msgDialog
fix oskDialog
* fix OskDialog part 2
fix MsgDialog part 2
* This bug is evil, and it should be ashamed of itself.
* Refactor YAML. Commented out gui options that aren't added to config yet (add em back later when we merge that in)
* Fix pad stuff.
* add SaveDataUtility (#45)
* add SaveDataUtility
* fix slots
* fix slots again
fix lists not showing stuff
fix dialogs not showing
add colClicked
refactor stuff and polish some layouts
* add SaveDataDialog.h and SaveDataDialog.cpp
* tidy up mainwindow
* add callback
* fix RegisterEditor (#47)
* fix RegisterEditor
* fix other dialogs' immortality (gasp...vampires)
* remove debug leftovers
* fix InstructionEditor (#46)
* fix InstructionEditor
* fix typo
* Fix MouseClickEvents in RSXDebugger (#50)
* Fix MouseClickEvents in RSXDebugger
Fix focus on MemoryViewer and RSXDebugger
Adjust PadButtonWidth
* fix another comment
* fix debuggerframe events (#49)
* Fix pad settings bro (#48)
* Fix pad settings bro
* fix comment
* Icons and Menu-Additions (#39)
* Add Icons and iconlogic to cornerWidget and actions
* add cornerWidget toggle
fix dockwidget action state on start
remove DoSettings
* fix game removal bug
remove tableitem focus rectangle
therefore add TableItemDelegate.h
* remove grid and focus rectangle from autopausedialog
* add fullscreen checkbox to misctab
minor padsettings layout improvements
* Add show category submenu to view menu
Add gamelist filter accordingly
fix minor bug where play icon was displayed despite pause label
add boolean b_fullscreen to mainwindow for later use in GSFrame
* fix headers in autopausesettings
fix remove bug in autopausesettings
add delete keypressevent in autopausesettings
fix missing tr() and minor refactoring in gamelist
* add default Icons for play/pause/stop/restart
* Fix fullscreen start. Some stuff was wrong with settings, just trust me.
* remove fullscreen leftovers and fix merge
* SPU stuff. (There was also a weird thing with config.h in GLGSFrame.h with an include that I removed to fix build)
* please neko's lambda fetishes (#53)
* please neko's lambda fetish in mainwindow
* please neko's lambda fetish in gamelistframe
* please neko's lambda fetish in logframe
* fix neko's lambda fetish in debuggerframe
* pleasefixdofetishsomething in Autopausesettingsdialog
* fix sth sth lambda in cg disasm
* lambda stuff in instructioneditor
* lambda kernelexplorer
* lambda-ise memoryviewer
* lambda rsxdebugger
* lambda savedatautil
this could be done even more, but the functions are not implemented
* Rpcs3 qt fixes -- shadow taskbar bug (#52)
* SShadow's bug of taskbar progress staying fixed on cancelling pkg install.
* other taskbar
* i'm still a baka
* Fix a warning
* qtQt refactoring (#54)
* fix neko's snake fetish
* File names should match headers. Are these the names I want? Not necessarily. But, this is much less confusing.
* i thought I committed everything with stage all.........................
* remove unused utilities
* The most important commit of them all.
* Disable legacy opengl buffers when not using opengl.
* fix code review comment
* Quick crash patch. Neko removed autopause. SO, I remove it too from emusettings/misc tab
* Merge lovely things from master (#55)
* Configuration simplified
* untrivial parts of the merge
* no need for these options anymore
* Minor change to fix column widths at startup (not sure why it doesn't work already, but adding the true makes it work so......... whatever)
* here ya go
* FIx hitting okay in settings causing graphics to messup (#57)
* fixes + msgdialog taskbarprogress (#56)
* fix ok button in taskbar
add taskicon progressbar for msgdialog
add tablewidgetitem to rsxdebugger
fix comments in save_data_utility.cpp
* fix d3d adapter default
* fix taskicon progressbar not being destroyed properly
* add last_path to filedialogs
* fix msgdialog crash on ok (#58)
* fix thread stopping in debbugerFrame (#59)
* Move Emu.init to be first. This will fix the qt stuff seeming to ignore the virtual filesystem in the config. (VFS to be made soon maybe) (#60)
* Fix full screen opening on double RIGHT click.
* fix other instances of double click ...
* Fix locaiton of gui config. (#61)
* fix d3d bug (#62)
* fix d3d bug
* small utf8 addition
* Fix cmake for qt (#64)
* Initial CMake fix
* Fix compilation with GCC
* Get rid of awful hack
* Update cotire with qt support
* Maybe fix travis
* Emergency Hack Relief Program Activated
* Fix travis build (#65)
* make about dialog great again (#67)
and add previous additions
* Fix library sort / smart gamelist context menu (#63)
* fix library sort
* add Title to custom game config dialog
* disable options on gamelist context menu
* use namespace for category Strings
* introduce sstr
* fix some tr nonsense
* Rpcs3qt Appveyor (#68)
Fix appyveyor build!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* possible fix for gamelist icons (#69)
add warning for appicon
* Fix clang build (#66)
Hcorion, the build savior.
* Rpcs3 qt resources (#70)
* Resource files attempt 1
* Autorcc should probably be on?
* forgot the most important file lol
* Forgot an instance of the icon in the code...
* Patch fix for clang build.
* vulkan/d3d12 combobox merge (#71)
* add vulkan adapterbox and merge with d3d12 box
* fix adapter text on other renderer
* gather render strings
* attempt fix on gamelist row height
* adjust adapter behaviour to new guideline
* Compiler of Peace.
* High critical hit rate.
* Mugi eating strawberries is savage.
* Apply KD-11 Hotfix (#73)
* Most of Ani Adjusts (#72)
* Most of the adjustments are made here.
* fix gamelist rowheight
* fix msg dialog layout and disable_cancel
* cleanup
* fix disable cancle again
* fix debuggerframe buttons and doubleclick
* Add a fun little bonus feature :) (#74)
* category filters simplyfied (#75)
* Cleaning up cmake a bit.
* fixezzzzzz (#76)
* upgrade Info Boxes
* upgrade file explorer
* refactor GetSettings and SetSettings
* second refactoring
* cleanup
* travis is a grammar nazi
* second travis shenanigans
* third travis weirdo thingy
* travis 4 mega fun
* travis 5 default to def
* finish refactoring for settings
fix gamelist headers
* hotfix msgdialog and infobox (#77)
* msgdialog fix 1
* fix zombie infobox
* Rpcs3 Qt Welcome Page (#78)
* Add a welcome dialog.
* Add enter to end of file
* i'm an idiot
* last mistake i hope
* sponsored via --> funded by
* RPCS3 does not condone piracy.
* Mega Adjusts
* Ani Adjustments and a few refactorings
* Yay
* Add Gamelist Icon Sizes (#79)
* Reverting Mega's suggestion. If people can use alt-f4 to get around this dialog, they can probably use an emulator too.
* Fix firmware file choice dialog in QT GUI (#80)
* ani adjusts 2 + minor icon size simplifications (#81)
FPS Additions
* Update Travis to Qt 5.9 (#82)
* Optimizations
1) Some headers simplified for better compilation time
2) Some templates simplified for smaller executable size
3) Eliminate std::future to fix compilation for mingw64
4) PKG installation can be cancelled now
5) cellGame fixes
6) XAudio2 fix for mingw64
7) PPUInterpreter bug fixed (Clang)
* any_pod<> implemented
Aliases: any16, any32, any64
rsx::make_command fixed
Moves GL, minidx12, OpenAL, stblib to 3rdparty
Fixes AppVeyor and CMakeLists (travis-ci.yml doesn't need any changes)
Points directories in the VS solution files to the new ones on the
externals directory
Includes stuff with the < > syntax instead of " "
