diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-09-29 16:03:54 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-09-29 16:03:54 +0000 |
| commit | e7accf1d04937aafeda19cf5575398465a7ccd5c (patch) | |
| tree | 86a71fd37ec01c58e77d1a67e66daa151484a836 /qmake | |
| parent | 69d94698c98150c9cc32ee8a14bc29b8ea3766c9 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/09/29 18:03:23+02:00 uni-frankfurt.de!mickeyl
konqueror and libqpe-opie: catch up with qt staging changes
2004/09/29 18:02:28+02:00 uni-frankfurt.de!mickeyl
first bits for the qt2/qt3 split. Notes: a) qte2 is default, so no changes should be necessary for packages using the qmake or qmake-derived oeclasses. b) overriding QTDIR is no longer supported, remove that from your .oe files. c) manual changes for non-qmake packages can be necessary. d) inherit qt3x11 to configure qmake for Qt3/X11 (sic)
2004/09/29 17:58:32+02:00 uni-frankfurt.de!mickeyl
fix section for mikmod and modplugplay
2004/09/29 17:12:08+02:00 uni-frankfurt.de!mickeyl
enable losetup in default busybox config
BKrev: 415adcea4UMfz2lvSSK4JcNs17Q9sQ
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/qmake-native-3.2.3/linux-oe-qmake.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf index 4af0a02c04..62410c5f13 100644 --- a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf +++ b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf @@ -21,7 +21,7 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = $(OE_QMAKE_CXX) -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE @@ -54,8 +54,8 @@ QMAKE_LIBS = $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = QMAKE_LIBS_X11SM = -QMAKE_LIBS_QT = -lqte -QMAKE_LIBS_QT_THREAD = -lqte-mt +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_THREAD = -lpthread |