Commit Graph

109 Commits

Author SHA1 Message Date
David Hrdlička
0f4931cdcc Fix macOS bundles 2022-02-07 23:05:59 +01:00
David Hrdlička
bf3bdb7367 Work around MinGW's weird OpenAL config 2022-02-07 22:50:49 +01:00
David Hrdlička
ee998a71a4 Fix Qt on Mac bundle generation 2022-02-07 21:08:28 +01:00
David Hrdlička
d879628553 Use fixup_bundle on Windows as well 2022-02-07 20:35:55 +01:00
David Hrdlička
7d758ea9cd Prefer config mode for finding OpenAL 2022-02-07 20:32:43 +01:00
David Hrdlička
bb25829dbc Try to build a static build on MSYS2 2022-02-07 20:26:00 +01:00
Alexander Babikov
1a7a93010d Remove the obsolete logging and defunct VRAM dumping options from the Win32 UI 2022-02-07 18:09:21 +05:00
dob205
038082e2dc qt: macos bundling improvements 2022-02-03 22:30:42 +02:00
ts-korhonen
961df796bc Merge branch 'master' of https://github.com/86Box/86Box into qt 2022-01-30 20:48:50 +02:00
Jasmine Iwanek
c1d2a50175 Give OpenAL the ability to be optional 2022-01-29 20:25:00 -05:00
ts-korhonen
4b65a9fc47 qt: mac bundling improvements from dob205 2022-01-27 21:17:10 +02:00
ts-korhonen
7fdeff1851 qt: macos patches from dob205 2022-01-21 19:08:58 +02:00
Cacodemon345
62a4a025b1 Port Win32 Discord integration to Linux and macOS 2022-01-09 01:04:59 +06:00
ts-korhonen
021ec8e50d qt: Make QT default off to prepare merging to upstream 2022-01-08 15:36:52 +02:00
Cacodemon345
17e657f0ee Add support for Qt6 2021-12-31 16:47:49 +06:00
Cacodemon345
81055c03e2 Begin Qt translation framework 2021-12-31 12:39:55 +06:00
ts-korhonen
63256bfb8f Merge branch 'master' of https://github.com/86Box/86Box into qt 2021-12-21 21:48:43 +02:00
David Hrdlička
9f03225e5a Add build options related to executable generation 2021-12-21 18:05:12 +01:00
ts-korhonen
9adc683cbc Merge branch 'master' of https://github.com/86Box/86Box into qt 2021-12-20 22:30:50 +02:00
David Hrdlička
52486e121e Convert CMake files to 4 spaces indentation 2021-12-20 15:08:23 +01:00
David Hrdlička
ab2a8f24be CMake install target fixes 2021-12-20 15:07:33 +01:00
David Hrdlička
043ab9ce77 MSVC workarounds should apply to all non-MinGW builds 2021-12-20 15:07:33 +01:00
David Hrdlička
6809f379cd Remove unneeded build actions; fix some comments 2021-12-20 15:07:33 +01:00
David Hrdlička
38fddca97a Move CI-related build info to the root build file 2021-12-20 15:07:26 +01:00
David Hrdlička
6a76fb5746 Move Mac related stuff from the main build file 2021-12-20 14:37:46 +01:00
ts-korhonen
61563bea57 Merge branch 'master' of https://github.com/86Box/86Box into qt 2021-12-18 21:25:34 +02:00
TC1995
688748adbe Added QEMU's fifo8 code.
Added the NCR 53c90 SCSI MCA card and reworked the AMD PCscsi/Tekram DC390 code to use a better port.
2021-12-18 14:44:14 +01:00
ts-korhonen
fee52c0b99 Merge branch 'master' of https://github.com/86Box/86Box into qt 2021-12-17 21:33:46 +02:00
David Hrdlička
7381ab6928 Minor changes to threading
- Renamed `cpp11_thread.cpp` to `thread.cpp`
- Removed features that are only supported by Win32 threads (`thread_wait` with timeout and mutex with spinlock)
- Fixed formatting in `thread.cpp`
2021-12-17 19:59:25 +01:00
ts-korhonen
265abedb3b Merge branch 'qt' of https://github.com/jgilje/86Box into qt 2021-12-17 16:23:59 +02:00
Joakim L. Gilje
d548dd7e52 Merge branch 'master' of github.com:86box/86Box into qt 2021-12-17 10:59:04 +01:00
David Hrdlička
e0a73a99ec Turn the RtMidi module into a full standalone MIDI module
Removes the now-redundant platform MIDI infrastructure
2021-12-17 10:10:59 +01:00
David Hrdlička
275919859a Fix typos 2021-12-17 07:41:07 +01:00
David Hrdlička
7df9e2a454 Add a compile option to choose between thread implementations 2021-12-17 06:59:53 +01:00
ts-korhonen
2589a79f6a Merge branch 'master' of https://github.com/86Box/86Box into qt 2021-12-17 07:38:43 +02:00
OBattler
707acadd36 Replaced the Win32 threads with the proven to be better performing C++11 threads. 2021-12-17 03:49:54 +01:00
ts-korhonen
44873ba9b9 Make compatible with qt5-static build 2021-12-06 17:31:25 +02:00
Joakim L. Gilje
2788793d07 Merge github.com:86box/86Box into qt 2021-12-06 10:03:04 +01:00
David Hrdlička
7064e76896 Revert "Attempted fix for RtMidi."
This reverts commit 9e00ac9c9f.
2021-12-04 01:31:30 +01:00
OBattler
9e00ac9c9f Attempted fix for RtMidi. 2021-12-04 01:24:27 +01:00
OBattler
051b41ea6c Updated MacOS bundle version. 2021-12-04 01:21:11 +01:00
David Hrdlička
538b9bc478 Fix link order in MSYS2 build 2021-12-03 23:10:46 +01:00
David Hrdlička
4338560466 Properly find rtmidi on the CMake build 2021-12-03 21:51:31 +01:00
OBattler
3eaa6153b5 Switched MIDI to RtMidi. 2021-12-03 20:12:44 +01:00
Joakim L. Gilje
6aef88c957 set project cpp-files to c++17 when qt is included, search and link to a threading library 2021-11-28 20:54:32 +01:00
Joakim L. Gilje
859ee888ce fixed macos bundling (thanks to @dob205) 2021-11-28 20:50:02 +01:00
Joakim L. Gilje
c587a02b1a Initial Qt Commit 2021-11-25 10:20:56 +01:00
dob205
5357cea1bc Showing the build number in the user viewable bundle version 2021-11-19 17:42:48 +01:00
dob205
6f9d4e5bb3 slight fixes for that file
Makes the macOS bundle display the proper copyright and version numbers
2021-11-19 17:40:28 +01:00
dob205
5f303ba4c7 Cleaning up some things k 2021-11-19 17:38:42 +01:00