diff options
| author | Pino Toscano <toscano.pino@tiscali.it> | 2014-12-27 17:32:51 +0100 |
|---|---|---|
| committer | Pino Toscano <toscano.pino@tiscali.it> | 2014-12-29 17:53:58 +0100 |
| commit | 8f0e84bec513ad28c3ec479053fbc59add3959e1 (patch) | |
| tree | d4d2e0e53879f9f7cf4bb0d201ad480f908a05d9 /mkspecs/hurd-g++ | |
| parent | 9a3674302c014800d53d1c0165a7876c75eacc9e (diff) | |
small improvements to the hurd-g++ mkspec
- remove the X11R6 paths, since they were gone for years, and their
lack may cause build issues with CMake config files
- add empty QMAKE_*_XCB variables, as done in the common linux.conf
- add to QMAKE_PLATFORM, not just reset it (just done in other mkspecs)
- borrow QMAKE_LFLAGS_GCSECTIONS from the common linux.conf
Change-Id: I94e05032f8195bbda73dffe1da02eec7ac679045
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs/hurd-g++')
| -rw-r--r-- | mkspecs/hurd-g++/qmake.conf | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf index 54a152de97..d53b49ced2 100644 --- a/mkspecs/hurd-g++/qmake.conf +++ b/mkspecs/hurd-g++/qmake.conf @@ -3,19 +3,20 @@ # MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = hurd +QMAKE_PLATFORM += hurd CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib QMAKE_CFLAGS_THREAD += -D_REENTRANT QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD +QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections QMAKE_INCDIR = QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /usr/X11R6/include -QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_OPENGL = /usr/X11R6/include -QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_X11 = +QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_OPENGL = +QMAKE_LIBDIR_OPENGL = QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL QMAKE_INCDIR_EGL = @@ -33,6 +34,10 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread +QMAKE_CFLAGS_XCB = +QMAKE_LIBS_XCB = +QMAKE_DEFINES_XCB = + QMAKE_AR = ar cqs QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P |