Compare commits
No commits in common. "5573355c8e7f90e6566978f43fb90fcc55511d50" and "7a02dcfa3c9093fb91e08b508806ffb8299b40bd" have entirely different histories.
5573355c8e
...
7a02dcfa3c
|
|
@ -3,21 +3,8 @@ build-job:
|
|||
image: ubuntu:22.04
|
||||
script:
|
||||
- apt-get update
|
||||
- apt-get install -y git cmake g++ freeglut3-dev qt6-base-dev
|
||||
- apt-get install -y git cmake g++ freeglut3-dev qt6-base-dev qt5-qmake qtbase5-dev-tools
|
||||
- mkdir -p build
|
||||
- cd build
|
||||
- cmake ..
|
||||
- cmake --build .
|
||||
|
||||
build-win64:
|
||||
tags:
|
||||
- "windows"
|
||||
before_script:
|
||||
- choco install -y cmake python
|
||||
- $env:Path += ';C:\Program Files\CMake\bin'
|
||||
stage: build
|
||||
script:
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake ..
|
||||
- cmake --build .
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ set(CMAKE_AUTOUIC ON)
|
|||
set(CMAKE_CXX_STANDARD 11)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
|
||||
find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets)
|
||||
find_package(OpenMP)
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1188</width>
|
||||
<height>939</height>
|
||||
<height>898</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -1651,7 +1651,7 @@
|
|||
</widget>
|
||||
<resources>
|
||||
<include location="../samplebrain.qrc"/>
|
||||
<include location="../samplebrain.qrc"/>
|
||||
<include location="../app/samplebrain.qrc"/>
|
||||
</resources>
|
||||
<connections>
|
||||
<connection>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ int main( int argc , char *argv[] ){
|
|||
|
||||
|
||||
QApplication app(argc, argv);
|
||||
cerr<<"Qt version: "<<qVersion()<<endl;
|
||||
|
||||
QSettings settings("thentrythis", "samplebrain");
|
||||
|
||||
// slight over-use of OSC servers here, but the are packaged nicely for
|
||||
|
|
|
|||
Loading…
Reference in New Issue