summaryrefslogtreecommitdiff
authorschurig <schurig>2004-09-08 15:36:04 (UTC)
committer schurig <schurig>2004-09-08 15:36:04 (UTC)
commitdbab81a4311ab27fd991a7f56f7804d2212d057d (patch) (side-by-side diff)
tree4f726ad70a64728e59e985908f1fafb8ea091a63
parent548f5017a18a0d574baadfb3f063f734db13944a (diff)
downloadopie-dbab81a4311ab27fd991a7f56f7804d2212d057d.zip
opie-dbab81a4311ab27fd991a7f56f7804d2212d057d.tar.gz
opie-dbab81a4311ab27fd991a7f56f7804d2212d057d.tar.bz2
moved my qt2 headers to include/qt2, so that I can now have include/qt3 and
include/qt2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--mkspecs/qws/linux-ramses-g++/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/qws/linux-ramses-g++/qmake.conf b/mkspecs/qws/linux-ramses-g++/qmake.conf
index 028c157..5dc1bda 100644
--- a/mkspecs/qws/linux-ramses-g++/qmake.conf
+++ b/mkspecs/qws/linux-ramses-g++/qmake.conf
@@ -1,55 +1,55 @@
#
# $Id$
#
# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
#
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
CONFIG += qt warn_on release
OZDIR = /usr/src/ramses/oz
QTDIR = $$QTDIR/build/qt-2.3.5
STAGING_DIR = $$OZDIR/output/staging
STAGING_BIN = $$STAGING_DIR/build/bin
STAGING_LIB = $$STAGING_DIR/target/lib
STAGING_INC = $$STAGING_DIR/include
QMAKE_CC = ccache arm-linux-gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA)
+QMAKE_CFLAGS = -I$$STAGING_INC -I$$STAGING_INC/qt2 -pipe $(CFLAGS_EXTRA)
QMAKE_CFLAGS_WARN_ON = -Wall -W
QMAKE_CFLAGS_WARN_OFF =
QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
QMAKE_CFLAGS_THREAD = -D_REENTRANT
QMAKE_CXX = ccache arm-linux-g++ -DQT_QWS_RAMSES -DQT_QWS_DEVFS -DQT_QWS_CUSTOM
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
QMAKE_INCDIR =
QMAKE_LIBDIR =
QMAKE_INCDIR_X11 =
QMAKE_LIBDIR_X11 =
QMAKE_INCDIR_QT = $(QTDIR)/include
QMAKE_LIBDIR_QT = $(QTDIR)/lib
QMAKE_INCDIR_OPENGL = /usr/X11R6/include
QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
QMAKE_LINK = arm-linux-gcc
QMAKE_LINK_SHLIB = arm-linux-gcc
QMAKE_LFLAGS = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz $(LFLAGS_EXTRA)
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =