claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,780 Commits 1 Branch 0 Tags
63256bfb8f503b88fed329ba2e1ca4a8a4bce2da
Commit Graph

93 Commits

Author SHA1 Message Date
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
Miran Grča
5ee200eabd Merge pull request #1847 from jvernet/master 
MacOsX Compilation fixed
 2021-11-19 17:14:07 +01:00
jvernet
77b1f8a71e MacOsX Compilation 2021-11-19 16:57:38 +01:00
jvernet
46af2a7a8f MacOSX Default ROM PATH 2021-11-19 16:42:43 +01:00
Cacodemon345
e50afd9b6b Fix macOS linking 2021-11-19 20:42:03 +06:00
dob205
469a9d0b7a Adds the macOSXglue.m into the compilation process 
Enables to get the macOSXglue up and running while compiling 86Box on macOS, also executes some functions related to macOS now not on Windows and Linux anymore
 2021-11-19 13:44:53 +01:00
jvernet
13371d03bd macOSX Rom path detecttion 2021-11-19 12:41:31 +01:00
jvernet
63099ea3ff Update CMakeLists.txt 2021-11-17 20:30:50 +01:00
RichardG867
0de137daf7 Merge branch 'master' of https://github.com/86Box/86Box into cleanup30 
# Conflicts:
#	src/include/86box/machine.h
#	src/machine/m_at_socket7.c
#	src/machine/machine_table.c
#	src/video/vid_tgui9440.c
#	src/win/win.c
 2021-11-14 13:45:37 -03:00
OBattler
3730117a37 Conflict resolution. 2021-11-13 22:49:19 +01:00
RichardG867
bfe19db5b4 Shuffle around and improve build number injection 2021-11-12 21:53:12 -03:00
dob205
23b01383e0 Fixing compiling with normal user permissions 
This should enable compiling things on macOS without resorting to use sudo before cmake --build build --target install.
 2021-11-10 11:13:10 +01:00
dob205
99097d5555 Adjusting the install command 
This change should hopefully make the GitHub Actions instance happy for CMake.
 2021-11-10 10:40:51 +01:00
dob205
9f78c37f37 Tweaking things to fix potential compile errors 
Should hopefully make GitHub Actions happy
 2021-11-10 10:26:00 +01:00
dob205
4728483188 Updating the CMakeLists.txt to create macOS app bundles 
Changes the CMakeLists.txt to enable the creation of macOS app bundles via cmake --build build --target install including all necessary dylibs for a functioning macOS compile.
 2021-11-10 10:01:37 +01:00
OBattler
312ce110af Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-10-19 18:21:36 +02:00
Andreas J. Reichel
6dd744141c Make it build in arch linux and Debian 
* Probably unresolved external due to newer gcc, thus
  added libsdl to libui.a as well.
* Make it work for all distros, which either have SDL2::SDL2
  or ${SDL2_LIBRARIES}, provided by sdl2-config or FindSDL2.cmake.

Signed-off-by: Andreas J. Reichel <homebase_ar@web.de>
 2021-10-18 21:15:31 +02:00