| author | mickeyl <mickeyl> | 2005-02-12 15:47:06 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2005-02-12 15:47:06 (UTC) |
| commit | 0bf0f893a82426615cfe9f0bf764e1344c733ee3 (patch) (unidiff) | |
| tree | ba147bb8ea70b409f15a76196097de49056576b6 /mkspecs | |
| parent | f13760433a6526555bc5a4378ee3517f4053ac61 (diff) | |
| download | opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.zip opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.tar.gz opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.tar.bz2 | |
remove arm-linux'isms from linux-oe-g++ and make it depending on the value of OE_TARGET_SYS
this enables to build Opie against OE staging area targetting e.g. uclibc, mips, or whatever
| -rw-r--r-- | mkspecs/qws/linux-oe-g++/qmake.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/qws/linux-oe-g++/qmake.conf b/mkspecs/qws/linux-oe-g++/qmake.conf index 72bb489..bae5dbb 100644 --- a/mkspecs/qws/linux-oe-g++/qmake.conf +++ b/mkspecs/qws/linux-oe-g++/qmake.conf | |||
| @@ -10,10 +10,10 @@ CONFIG += qt link_prl | |||
| 10 | 10 | ||
| 11 | STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin | 11 | STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin |
| 12 | STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin | 12 | STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin |
| 13 | STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include $(OEDIR)/tmp/staging/arm-linux/include/freetype2/include | 13 | STAGING_INCDIR = $(OEDIR)/tmp/staging/$(OETARGETSYS)/include $(OEDIR)/tmp/staging/$(OETARGETSYS)/include/freetype2/include |
| 14 | STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib | 14 | STAGING_LIBDIR = $(OEDIR)/tmp/staging/$(OETARGETSYS)/lib |
| 15 | 15 | ||
| 16 | QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc | 16 | QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-gcc |
| 17 | QMAKE_LEX = flex | 17 | QMAKE_LEX = flex |
| 18 | QMAKE_LEXFLAGS = | 18 | QMAKE_LEXFLAGS = |
| 19 | QMAKE_YACC = yacc | 19 | QMAKE_YACC = yacc |
| @@ -27,7 +27,7 @@ QMAKE_CFLAGS_SHLIB = -fPIC | |||
| 27 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 27 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 28 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 28 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 29 | 29 | ||
| 30 | QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM | 30 | QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM |
| 31 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 31 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 32 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 32 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 33 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 33 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| @@ -48,8 +48,8 @@ QMAKE_LIBDIR_OPENGL = | |||
| 48 | QMAKE_INCDIR_QTOPIA= | 48 | QMAKE_INCDIR_QTOPIA= |
| 49 | QMAKE_LIBDIR_QTOPIA= | 49 | QMAKE_LIBDIR_QTOPIA= |
| 50 | 50 | ||
| 51 | QMAKE_LINK = $$STAGING_CROSSDIR/arm-linux-g++ | 51 | QMAKE_LINK = $$STAGING_CROSSDIR/$(OETARGETSYS)-g++ |
| 52 | QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/arm-linux-g++ | 52 | QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/$(OETARGETSYS)-g++ |
| 53 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 53 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 54 | QMAKE_LFLAGS_RELEASE= | 54 | QMAKE_LFLAGS_RELEASE= |
| 55 | QMAKE_LFLAGS_DEBUG= | 55 | QMAKE_LFLAGS_DEBUG= |