Commit graph

62 commits

Author SHA1 Message Date
Cacodemon345
0b3a6d8e84
Qt is now on by default for non-Windows 2022-02-08 14:22:48 +06:00
David Hrdlička
58aca9ebd4 Add libmt32emu and libslirp as optional dependencies to vcpkg manifest 2022-02-08 01:55:25 +01:00
David Hrdlička
7d758ea9cd Prefer config mode for finding OpenAL 2022-02-07 20:32:43 +01:00
David Hrdlička
7d7826d7a5 Set static build properly on non-Windows vcpkg targets 2022-02-07 20:30:33 +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
David Hrdlička
fdb67ee872 Revert "Turned QT on."
This reverts commit 732db12b31.
2022-02-07 00:21:24 +01:00
OBattler
732db12b31 Turned QT on. 2022-02-07 00:19:45 +01:00
ts-korhonen
577a72748f qt: make qt dependencies a feature in vcpkg
so they are not included if building non-qt
2022-02-06 13:30:39 +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
David Hrdlička
8e00b37e22 Clean up the build scripts 2022-01-29 23:50:53 +01:00
ts-korhonen
b70abb8535 Merge branch 'master' of https://github.com/86Box/86Box into qt 2022-01-27 21:18:01 +02:00
Jasmine Iwanek
abce83ad34 Initial Boca Research BocaRAM/AT support 2022-01-26 23:24:19 -05:00
Jasmine Iwanek
ae985779c8 Build isamem dev stuff 2022-01-26 19:07:34 -05: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
ts-korhonen
0be3204ad3 Merge branch 'master' of https://github.com/86Box/86Box into qt 2021-12-27 14:25:45 +02:00
OBattler
9cafca09ab Increased the 86Box version to 3.2. 2021-12-25 21:42:02 +01:00
ts-korhonen
5b598bf3b0 Merge branch 'master' of https://github.com/86Box/86Box into qt 2021-12-22 17:24:39 +02:00
Alexander Babikov
38ca621ac5 Remove leftovers of no longer used build options 2021-12-22 05:29:30 +05: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
7dc1df9ef1 Clean up the optional features list in the root build file 2021-12-20 15:17:42 +01:00
David Hrdlička
52486e121e Convert CMake files to 4 spaces indentation 2021-12-20 15:08:23 +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
e5ed33b91b Determine the value of CMAKE_MSVC_RUNTIME_LIBRARY properly 2021-12-20 14:37:51 +01: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
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
Joakim L. Gilje
2788793d07 Merge github.com:86box/86Box into qt 2021-12-06 10:03:04 +01:00
ts-korhonen
40abfc1b5e Lower required OpenGL version from 3.3 -> 3.0 2021-12-04 21:26:55 +02:00
David Hrdlička
2175fc5888 Require C++11 support; fixes the Mac build 2021-12-03 21:51:31 +01:00
David Hrdlička
156e88f20a Use static MSVCRT only when using static vcpkg deps
Should fix MT/MD mismatch with rtmidi
2021-12-03 21:51:31 +01:00
OBattler
d28c9af753 Bumped up the version to 3.1. 2021-12-03 00:47:23 +01:00
Cacodemon345
fc9d73b541 Wayland mouse support
Fix moving items with mouse when captured on macOS
2021-12-02 16:26:33 +06:00
Joakim L. Gilje
c587a02b1a Initial Qt Commit 2021-11-25 10:20:56 +01:00
RichardG867
9699d63e70 Add icon type switch to CMake and de-duplicate wide version strings 2021-11-05 22:02:34 -03:00
RichardG867
06ab671d32 Allow inserting of build number and git hash through CMake, while also porting the mouse capture title fix from the CLI branch 2021-11-05 21:49:00 -03:00
David Hrdlička
73cac00119 Remove pthreads on Win32 from build files 2021-09-23 23:03:33 +02:00
David Hrdlička
84c56859ec Small fixup in thread_wait_event 2021-09-18 20:04:03 +02:00
David Hrdlička
39653e366a Fix pthreads on non-MinGW Windows builds
- Use C11 standard `timespec_get` instead of `clock_gettime`
- Remove the unused `thread_sleep` function
2021-09-18 19:09:34 +02:00
David Hrdlička
719d155393 cmake: fix pthread linking on Windows 2021-09-15 12:50:33 +02:00
David Hrdlička
6c26a99841 cmake: full static linking on mingw builds 2021-09-02 15:34:06 +02:00
Cacodemon345
bd74669ad5 Enable CMake policy CMP0079 2021-08-29 23:50:21 +06:00
David Hrdlička
fbf93a6d32 cmake: add presets equivalent to the makefile 2021-08-29 15:04:50 +02:00
David Hrdlička
44ccefb28a cmake: refactor the architecture detection 2021-08-29 03:55:07 +02:00
David Hrdlička
b9e07113ca cmake: add DEBUG define for debug builds 2021-08-28 19:20:28 +02:00
Alexander Babikov
b4a16437d3 Add a separate build option for the OpenGL renderer 2021-04-26 02:45:20 +05:00