mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 13:10:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Linux build.

Browse Source
This commit is contained in:
mfeemster 2023-06-23 00:15:40 -06:00
parent f4a22ccc96
commit 6184b3c29e
6 changed files with 299 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Builds/QtCreator/defaults.pri
View File

@ -1,6 +1,6 @@
VERSION = 22.21.4.2 VERSION = 22.21.4.2
win32:CONFIG += skip_target_version_ext win32:CONFIG += skip_target_version_ext
CONFIG += c++20 CONFIG += c++2a
#message(PWD: $$absolute_path($$PWD)) #message(PWD: $$absolute_path($$PWD))
@ -191,7 +191,7 @@ win32 {
QMAKE_CXXFLAGS += -fPIC QMAKE_CXXFLAGS += -fPIC
QMAKE_CXXFLAGS += -fpermissive QMAKE_CXXFLAGS += -fpermissive
QMAKE_CXXFLAGS += -pedantic QMAKE_CXXFLAGS += -pedantic
QMAKE_CXXFLAGS += -std=c++20 QMAKE_CXXFLAGS += -std=c++2a
QMAKE_CXXFLAGS += -Wnon-virtual-dtor QMAKE_CXXFLAGS += -Wnon-virtual-dtor
QMAKE_CXXFLAGS += -Wshadow QMAKE_CXXFLAGS += -Wshadow
QMAKE_CXXFLAGS += -Winit-self QMAKE_CXXFLAGS += -Winit-self

2
archive/build_linux.sh
View File

@ -11,7 +11,7 @@ FRACTORIUM_PACKAGE=$BUILD_PATH/../Bin/Fractorium
FRACTORIUM_RPM_PACKAGE=$BUILD_PATH/../Bin/rpmbuild FRACTORIUM_RPM_PACKAGE=$BUILD_PATH/../Bin/rpmbuild
EXTRA_LIBS=/usr/lib/x86_64-linux-gnu EXTRA_LIBS=/usr/lib/x86_64-linux-gnu
# replace 5.12.8 by your QT version, and ensure the installation path is the same # replace 6.5.1 with your QT version, and ensure the installation path is the same
QT_PATH=/home/$USER/Dev/Qt/6.5.1/gcc_64/bin QT_PATH=/home/$USER/Dev/Qt/6.5.1/gcc_64/bin
LINUX_DEPLOY_QT=/home/$USER/Dev/linuxdeployqt-continuous-x86_64.AppImage LINUX_DEPLOY_QT=/home/$USER/Dev/linuxdeployqt-continuous-x86_64.AppImage