Update of /cvsroot/libfunutil/libfunutil
In directory sc8-pr-cvs1:/tmp/cvs-serv13014
Modified Files:
toc_shared.qmake.at
Log Message:
added QT's variation on C*FLAGS
Index: toc_shared.qmake.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc_shared.qmake.at,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- toc_shared.qmake.at 22 Aug 2003 16:22:44 -0000 1.5
+++ toc_shared.qmake.at 29 Aug 2003 10:40:17 -0000 1.6
@@ -8,7 +8,37 @@
FUN_LIB_SO = $$FUN_LIB_DIR/libfunUtil.so
CONFIG += qt warn_off debug
-exists( $(QTDIR)/lib/libqt-mt* ) {
- #message( "Configuring for multi-threaded Qt..." )
+
+QTDIR = @QTDIR@
+QTBINDIR = @QTBINDIR@
+QTINCDIR = @QTINCDIR@
+QTLIBDIR = @QTLIBDIR@
+# -lqt (or -lqt-mt?) if we have Qt, nothing if we don't.
+LQT = @LQT@
+UIC = @UIC@
+MOC = @MOC@
+QMAKE = @QMAKE@
+
+CC = @CC@
+INCLUDES += @INCLUDES@
+# C preprocessor flags, used in compiling C & C++ files.
+CPPFLAGS += @CPPFLAGS@
+CPPFLAGS += $$INCLUDES -DHAVE_CONFIG_H=1
+# Optimization flags (-g or -On) used in compiling C & C++ files.
+OPT = @OPT@
+# Warning flags (-Wall, -Werror, -woff, etc.) used in compiling C & C++ files.
+WARN = @WARN@
+# C flags, used in compiling C files. Includes $$OPT and $$WARN.
+QMAKE_CFLAGS += @CFLAGS@
+QMAKE_CFLAGS += $$OPT $$WARN
+# C++ flags, used in compiling C++ files. Includes $$OPT and $$WARN.
+QMAKE_CXXFLAGS += @CXXFLAGS@
+QMAKE_CXXFLAGS += $$OPT $$WARN
+# ld flags, used in linking binaries.
+LDFLAGS += @LDFLAGS@
+
+
+exists( $$QTDIR/lib/libqt-mt* ) {
+ # message( "Configuring for multi-threaded Qt..." )
CONFIG += thread
}
|