diff options
Diffstat (limited to 'mkspecs/freebsd-g++')
-rw-r--r-- | mkspecs/freebsd-g++/qmake.conf | 24 | ||||
-rw-r--r-- | mkspecs/freebsd-g++/qplatformdefs.h | 7 |
2 files changed, 9 insertions, 22 deletions
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf index 56529389f6..1f4448889e 100644 --- a/mkspecs/freebsd-g++/qmake.conf +++ b/mkspecs/freebsd-g++/qmake.conf @@ -3,32 +3,14 @@ # MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = freebsd bsd +QMAKE_PLATFORM = freebsd -include(../common/unix.conf) +include(../common/bsd/bsd.conf) -QMAKE_CFLAGS_THREAD = -pthread - -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -# Addon software goes into /usr/local on the BSDs, by default we will look there +# Addon software goes into /usr/local on FreeBSD, 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) load(qt_config) diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h index a7305fe8ea..0e3fd6b2b8 100644 --- a/mkspecs/freebsd-g++/qplatformdefs.h +++ b/mkspecs/freebsd-g++/qplatformdefs.h @@ -37,4 +37,9 @@ ** ****************************************************************************/ -#include "../freebsd-clang/qplatformdefs.h" +#ifndef QPLATFORMDEFS_H +#define QPLATFORMDEFS_H + +#include "../common/bsd/qplatformdefs.h" + +#endif // QPLATFORMDEFS_H |