Merge branch 'master' of github.com:86box/86Box into qt

This commit is contained in:
Joakim L. Gilje
2021-12-17 10:59:04 +01:00
27 changed files with 315 additions and 634 deletions

View File

@@ -65,6 +65,7 @@ option(VRAMDUMP "Video RAM dumping" OFF)
option(DINPUT "DirectInput" OFF)
option(DISCORD "Discord integration" ON)
option(QT "QT GUI" ON)
option(CPPTHREADS "C++11 threads" ON)
option(NEW_DYNAREC "Use the PCem v15 (\"new\") dynamic recompiler" OFF)