diff options
Diffstat (limited to 'mkspecs/unsupported')
-rw-r--r-- | mkspecs/unsupported/freebsd-g++/qmake.conf (renamed from mkspecs/unsupported/freebsd-clang/qmake.conf) | 8 | ||||
-rw-r--r-- | mkspecs/unsupported/freebsd-g++/qplatformdefs.h (renamed from mkspecs/unsupported/freebsd-clang/qplatformdefs.h) | 2 | ||||
-rw-r--r-- | mkspecs/unsupported/freebsd-g++46/qmake.conf | 44 | ||||
-rw-r--r-- | mkspecs/unsupported/freebsd-g++46/qplatformdefs.h | 34 |
4 files changed, 82 insertions, 6 deletions
diff --git a/mkspecs/unsupported/freebsd-clang/qmake.conf b/mkspecs/unsupported/freebsd-g++/qmake.conf index 9d9815a7b3..527a94870c 100644 --- a/mkspecs/unsupported/freebsd-clang/qmake.conf +++ b/mkspecs/unsupported/freebsd-g++/qmake.conf @@ -1,11 +1,11 @@ # -# qmake configuration for freebsd-clang +# qmake configuration for freebsd-g++ # MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = freebsd bsd -include(../common/unix.conf) +include(../../common/unix.conf) QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE @@ -15,7 +15,6 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD QMAKE_INCDIR = /usr/local/include QMAKE_LIBDIR = /usr/local/lib -QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined QMAKE_LFLAGS_THREAD = -pthread QMAKE_LIBS = @@ -31,6 +30,5 @@ QMAKE_NM = nm -P QMAKE_RANLIB = include(../../common/gcc-base-unix.conf) -include(../../common/clang.conf) - +include(../../common/g++-unix.conf) load(qt_config) diff --git a/mkspecs/unsupported/freebsd-clang/qplatformdefs.h b/mkspecs/unsupported/freebsd-g++/qplatformdefs.h index 68a886ed89..b52be38b4e 100644 --- a/mkspecs/unsupported/freebsd-clang/qplatformdefs.h +++ b/mkspecs/unsupported/freebsd-g++/qplatformdefs.h @@ -31,4 +31,4 @@ ** ****************************************************************************/ -#include "../../freebsd-g++/qplatformdefs.h" +#include "../../freebsd-clang/qplatformdefs.h" diff --git a/mkspecs/unsupported/freebsd-g++46/qmake.conf b/mkspecs/unsupported/freebsd-g++46/qmake.conf new file mode 100644 index 0000000000..11041dee3d --- /dev/null +++ b/mkspecs/unsupported/freebsd-g++46/qmake.conf @@ -0,0 +1,44 @@ +# +# qmake configuration for freebsd-g++46 (using g++46 from ports/lang/gcc) +# + +MAKEFILE_GENERATOR = UNIX +QMAKE_PLATFORM = freebsd bsd + +include(../../common/unix.conf) + +QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE + +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + +# Addon software goes into /usr/local on the BSDs, by default we will look there +QMAKE_INCDIR = /usr/local/include +QMAKE_LIBDIR = /usr/local/lib + +QMAKE_LFLAGS_THREAD = -pthread + +QMAKE_LIBS = +QMAKE_LIBS_DYNLOAD = +QMAKE_LIBS_EXECINFO = -lexecinfo +QMAKE_LIBS_X11 = -lXext -lX11 -lm +QMAKE_LIBS_OPENGL = -lGL +QMAKE_LIBS_THREAD = + +QMAKE_AR = ar cqs +QMAKE_OBJCOPY = objcopy +QMAKE_NM = nm -P +QMAKE_RANLIB = + +include(../../common/gcc-base-unix.conf) +include(../../common/g++-unix.conf) + +# Redefined here because g++-base.conf sets QMAKE_CC and QMAKE_CXX +# to gcc and g++, respectively. +QMAKE_CC = gcc46 +QMAKE_CXX = g++46 +QMAKE_LINK_C = $$QMAKE_CC +QMAKE_LINK_C_SHLIB = $$QMAKE_CC +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX + +load(qt_config) diff --git a/mkspecs/unsupported/freebsd-g++46/qplatformdefs.h b/mkspecs/unsupported/freebsd-g++46/qplatformdefs.h new file mode 100644 index 0000000000..b52be38b4e --- /dev/null +++ b/mkspecs/unsupported/freebsd-g++46/qplatformdefs.h @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the qmake spec of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "../../freebsd-clang/qplatformdefs.h" |