We're getting closer and closer, qt4 is more configurable and gets QT flags

for you for CXXFLAGS and LDFLAGS, added a bunch more stuff and fixed a strange
function input bug.

2 files changed, 64 insertions, 7 deletions

diff --git a/share/autoinclude/general-rules.bld b/share/autoinclude/general-rules.bld
index 46720c6..30a4376 100644
--- a/share/autoinclude/general-rules.bld
+++ b/share/autoinclude/general-rules.bld
@@ -78,7 +78,7 @@ rule "lib"
 rule "cpp"
 {
         input "*.cpp";
-        output cppToObj();
+        output INPUT.cppToObj();
 //      output replace(".cpp", ".o");
         requires getMakeDeps("${CXX} ${CXXFLAGS} -M ${INPUT}");
         profile "build"
@@ -91,7 +91,7 @@ rule "cpp"
 rule "c"
 {
         input "*.c";
-        output cToObj();
+        output INPUT.cToObj();
 //      output replace(".c", ".o");
         requires getMakeDeps("${CC} ${CFLAGS} -M ${INPUT}");
         profile "build"
@@ -115,8 +115,8 @@ rule "bison"
 rule "flex"
 {
         input "*.l";
-        output replace(".l", ".yy.c");
-        output replace(".l", ".yy.h");
+        output INPUT.replace(".l", ".yy.c");
+        output INPUT.replace(".l", ".yy.h");
         profile "build"
         {
                 execute("${FLEX} ${FLEXFLAGS} ${INPUT}");
diff --git a/share/include/qt4.bld b/share/include/qt4.bld
index 749cc52..a5a7867 100644
--- a/share/include/qt4.bld
+++ b/share/include/qt4.bld
@@ -1,4 +1,58 @@
 
+function qt_getCXXFLAGS()
+{
+        if QTDIR == null then
+        {
+                error "QTDIR is not set, cannot find QT tools.";
+        }
+
+        ret = "-D_REENTRANT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LI "
+                "-DQT_SHARED -I${QTDIR}/mkspecs/linux-g++ "
+                "$(PKG_CONFIG_PATH=PKG_CONFIG_PATH:${QTDIR}/lib/pkgconfig "
+                "pkg-config --cflags QtCore QtGui ice glu x11 xext libpng freetype2 "
+                "gobject-2.0 sm xrender fontconfig gthread-2.0 glib-2.0)";
+        if UI_DIR != null then
+        {
+                ret += "-I${UI_DIR}";
+        }
+        if RCC_DIR != null then
+        {
+                ret += "-I${RCC_DIR}";
+        }
+        if MOC_DIR != null then
+        {
+                ret += "-I${MOC_DIR}";
+        }
+        return ret;
+}
+
+function qt_getLDFLAGS()
+{
+        if QTDIR == null then
+        {
+                error "QTDIR is not set, cannot find QT tools.";
+        }
+
+        return "-Wl,-rpath,${QTDIR}/lib $(PKG_CONFIG_PATH="
+                "PKG_CONFIG_PATH:${QTDIR}/lib/pkgconfig "
+                "pkg-config --libs QtCore QtGui ice glu x11 xext libpng freetype2 "
+                "gobject-2.0 sm xrender fontconfig gthread-2.0 glib-2.0) -laudio -lz "
+                "-lm -ldl";
+}
+
+function qt_getToolPath( TOOL, DEFAULT )
+{
+        if QTDIR == null then
+        {
+                error "QTDIR is not set, cannot find QT tools.";
+        }
+        if TOOL == null then
+        {
+                return "${QTDIR}/bin/${DEFAULT}";
+        }
+        return TOOL;
+}
+
 function qt_uiToH()
 {
         if "${UI_DIR}" == "" then
@@ -22,7 +76,8 @@ rule "qt_ui"
         tag "headers";
         profile "build"
         {
-                execute("${QTDIR}/bin/uic -o ${OUTPUT} ${INPUT}");
+                UIC = qt_getToolPath( UIC, "uic" );
+                execute("${UIC} -o ${OUTPUT} ${INPUT}");
         }
 }
 
@@ -48,8 +103,9 @@ rule "qt_rcc"
         output INPUT.qt_qrcToCpp();
         profile "build"
         {
+                RCC = qt_getToolPath( RCC, "rcc" );
                 NAME = INPUT.fileName().replace(".qrc","");
-                execute("${QTDIR}/bin/rcc -name ${NAME} -o ${OUTPUT} ${INPUT}");
+                execute("${RCC} -name ${NAME} -o ${OUTPUT} ${INPUT}");
         }
 }
 
@@ -90,7 +146,8 @@ rule "qt_moc"
         output INPUT.qt_hToMocCpp();
         profile "build"
         {
-                execute("${QTDIR}/bin/moc -o${OUTPUT} ${INPUT}");
+                MOC = qt_getToolPath( MOC, "moc" );
+                execute("${MOC} -o${OUTPUT} ${INPUT}");
         }
 }