80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2063 from Cacodemon345/patch-42

Browse Source 
Qt is now on by default for non-Windows
This commit is contained in:
Miran Grča
2022-02-08 13:31:34 +01:00
committed by GitHub
parent 062b123019 1df33b4946
commit d58c07b94f
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/cmake.yml vendored
View File

@@ -260,6 +260,7 @@ jobs:
-D DEV_BRANCH=${{ matrix.build.dev-build }} -D DEV_BRANCH=${{ matrix.build.dev-build }}
-D NEW_DYNAREC=${{ matrix.build.new-dynarec }} -D NEW_DYNAREC=${{ matrix.build.new-dynarec }}
-D VNC=OFF -D VNC=OFF
-D QT=OFF
-D CMAKE_BUILD_TYPE=${{ matrix.build.type }} -D CMAKE_BUILD_TYPE=${{ matrix.build.type }}
-D CMAKE_C_COMPILER=gcc-11 -D CMAKE_CXX_COMPILER=g++-11 -D CMAKE_C_COMPILER=gcc-11 -D CMAKE_CXX_COMPILER=g++-11
- name: Build - name: Build
@@ -316,7 +317,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
run: brew install freetype sdl2 libpng openal-soft rtmidi run: brew install freetype sdl2 libpng openal-soft rtmidi qt@5
- name: Configure CMake - name: Configure CMake
run: >- run: >-
cmake -S . -B build cmake -S . -B build
@@ -325,6 +326,9 @@ jobs:
-D NEW_DYNAREC=${{ matrix.build.new-dynarec }} -D NEW_DYNAREC=${{ matrix.build.new-dynarec }}
-D VNC=OFF -D VNC=OFF
-D CMAKE_BUILD_TYPE=${{ matrix.build.type }} -D CMAKE_BUILD_TYPE=${{ matrix.build.type }}
-D QT=ON
-D Qt5_DIR=/usr/local/Cellar/qt@5/5.15.2/lib/cmake/
-D Qt5LinguistTools_DIR=/usr/local/Cellar/qt@5/5.15.2/lib/cmake/Qt5LinguistTools/
- name: Build - name: Build
run: cmake --build build run: cmake --build build
- name: Generate package - name: Generate package

4
CMakeLists.txt
View File

@@ -122,7 +122,11 @@ option(CPPTHREADS "C++11 threads"
option(NEW_DYNAREC "Use the PCem v15 (\"new\") dynamic recompiler" OFF) option(NEW_DYNAREC "Use the PCem v15 (\"new\") dynamic recompiler" OFF)
option(MINITRACE "Enable Chrome tracing using the modified minitrace library" OFF) option(MINITRACE "Enable Chrome tracing using the modified minitrace library" OFF)
option(DEV_BRANCH "Development branch" OFF) option(DEV_BRANCH "Development branch" OFF)
if(NOT WIN32)
option(QT "QT GUI" ON)
else()
option(QT "QT GUI" OFF) option(QT "QT GUI" OFF)
endif()
# Development branch features # Development branch features
# #