diff options
author | Oyvind Repvik <nail@nslu2-linux.org> | 2007-01-17 15:55:38 +0000 |
---|---|---|
committer | Oyvind Repvik <nail@nslu2-linux.org> | 2007-01-17 15:55:38 +0000 |
commit | 070f71e1d468e29882c8c2f42ed5f50c7fefa7ad (patch) | |
tree | 85749032210697fcf9289f48fb1a04bb828ad6a0 /packages/qmake/files/linux-oe-qmake.conf | |
parent | 36ecaee66eeb977fd8031107286975a496504136 (diff) | |
parent | f3b5d4ff15231c4fea35f9c92e681c00832640c4 (diff) |
merge of '33277e0b1c7ca0f6953d618e9606c2a3d9e112f3'
and 'e6a146e5939a85de15f93abfd20e4ad3ab3a9e5c'
Diffstat (limited to 'packages/qmake/files/linux-oe-qmake.conf')
-rw-r--r-- | packages/qmake/files/linux-oe-qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/qmake/files/linux-oe-qmake.conf b/packages/qmake/files/linux-oe-qmake.conf index 287dbeba19..205b693fda 100644 --- a/packages/qmake/files/linux-oe-qmake.conf +++ b/packages/qmake/files/linux-oe-qmake.conf @@ -56,7 +56,8 @@ QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) QMAKE_LIBS_X11SM = QMAKE_LIBS_QT = -l$(OE_QMAKE_LIBS_QT) QMAKE_LIBS_QT_THREAD = -l$(OE_QMAKE_LIBS_QT)-mt -QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_OPENGL = $(OE_QMAKE_LIBS_OPENGL) +QMAKE_LIBS_OPENGL_QT = $(OE_QMAKE_LIBS_OPENGL_QT) QMAKE_LIBS_THREAD = -lpthread QMAKE_MOC = $(OE_QMAKE_MOC) |