Compare commits

..

No commits in common. "5573355c8e7f90e6566978f43fb90fcc55511d50" and "7a02dcfa3c9093fb91e08b508806ffb8299b40bd" have entirely different histories.

4 changed files with 5 additions and 18 deletions

View File

@ -3,21 +3,8 @@ build-job:
image: ubuntu:22.04 image: ubuntu:22.04
script: script:
- apt-get update - 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 - mkdir -p build
- cd build - cd build
- cmake .. - cmake ..
- cmake --build . - 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 .

View File

@ -15,7 +15,7 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) 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(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets)
find_package(OpenMP) find_package(OpenMP)

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1188</width> <width>1188</width>
<height>939</height> <height>898</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -1651,7 +1651,7 @@
</widget> </widget>
<resources> <resources>
<include location="../samplebrain.qrc"/> <include location="../samplebrain.qrc"/>
<include location="../samplebrain.qrc"/> <include location="../app/samplebrain.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

View File

@ -33,7 +33,7 @@ int main( int argc , char *argv[] ){
QApplication app(argc, argv); QApplication app(argc, argv);
cerr<<"Qt version: "<<qVersion()<<endl;
QSettings settings("thentrythis", "samplebrain"); QSettings settings("thentrythis", "samplebrain");
// slight over-use of OSC servers here, but the are packaged nicely for // slight over-use of OSC servers here, but the are packaged nicely for