From a3dbdebcccef4f7917a19a8f27156ed2f2149aeb Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@netcitadel.com>
Date: Mon, 29 Dec 2008 17:49:20 +0000
Subject: [PATCH] changes to be able to build universal binary on mac os x,
 also to use ccache on mac os x

---
 build_num                       |  2 +-
 doc/ChangeLog                   |  5 +++
 runqmake.sh                     | 70 ++++++++++++++++++++-------------
 src/gui/CustomServiceDialog.cpp |  1 +
 src/gui/FWBAboutDialog.h        |  1 +
 src/gui/gui.pro                 |  4 +-
 src/gui/instDialog_compile.cpp  |  1 +
 7 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/build_num b/build_num
index 0e8d33f9f..842b1d552 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 715
+#define BUILD_NUM 716
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 987192399..243fe6aa7 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-29  vadim  <vadim@vk.crocodile.org>
+
+	* runqmake.sh: starting with v3.0.4 build 717, building universal
+	binary for Mac OS X (both x86 and ppc architectures)
+
 2008-12-28  vadim  <vadim@vk.crocodile.org>
 
 	* PolicyCompiler_iosacl_writers.cpp (PrintRule::_printDstService):
diff --git a/runqmake.sh b/runqmake.sh
index 8b83b8bcc..70a1a6b70 100755
--- a/runqmake.sh
+++ b/runqmake.sh
@@ -2,39 +2,53 @@
 
 test -z "${QMAKE}" && QMAKE="qmake"
 C=""
-test -n "$CCACHE" && C='QMAKE_CXX="ccache g++"'
+test -n "$QMAKESPEC" && C+="-spec $QMAKESPEC "
+test -n "$CCACHE" && C+='QMAKE_CXX="ccache	g++" '
 
-echo "QTDIR=$QTDIR"
-echo "Running qmake: ${QMAKE} ${C}"
+echo "QTDIR=\"$QTDIR\""
+echo "Running qmake: $QMAKE $C"
 
 oIFS=$IFS
-IFS=
+IFS=" 
+"
 
-${QMAKE} $C
+$QMAKE $C -recursive
 
-for d in src/ \
-    src/res/ \
-    src/tools/ \
-    doc/ \
-    src/antlr/ \
-    src/gui/ \
-    src/fwbedit/ \
-    src/ipt/ \
-    src/pflib/ \
-    src/pf/ \
-    src/ipf/ \
-    src/ipfw/ \
-    src/cisco_lib \
-    src/iosacl \
-    src/pix \
-    src/parsers/
-do
-  (cd $d; ${QMAKE} $C)
-done
 
-test -d src/unit_tests && {
-  (cd src/unit_tests/importer/; ${QMAKE} $C)
-}
+# test -n "$CCACHE" && C='QMAKE_CXX="ccache g++"'
+# test -n "$QMAKESPEC" && C="-spec $QMAKESPEC $C"
 
-IFS=$oIFS
+# echo "QTDIR=$QTDIR"
+# echo "Running qmake: ${QMAKE} ${C}"
+
+# oIFS=$IFS
+# IFS=
+
+# ${QMAKE} $C
+
+# for d in src/ \
+#     src/res/ \
+#     src/tools/ \
+#     doc/ \
+#     src/antlr/ \
+#     src/gui/ \
+#     src/fwbedit/ \
+#     src/ipt/ \
+#     src/pflib/ \
+#     src/pf/ \
+#     src/ipf/ \
+#     src/ipfw/ \
+#     src/cisco_lib \
+#     src/iosacl \
+#     src/pix \
+#     src/parsers/
+# do
+#   (cd $d; ${QMAKE} $C)
+# done
+
+# test -d src/unit_tests && {
+#   (cd src/unit_tests/importer/; ${QMAKE} $C)
+# }
+
+# IFS=$oIFS
 
diff --git a/src/gui/CustomServiceDialog.cpp b/src/gui/CustomServiceDialog.cpp
index 2d704d9a4..55771dc14 100644
--- a/src/gui/CustomServiceDialog.cpp
+++ b/src/gui/CustomServiceDialog.cpp
@@ -46,6 +46,7 @@
 #include "FWBSettings.h"
 
 #include "FWWindow.h"
+
 using namespace libfwbuilder;
 using namespace std;
 
diff --git a/src/gui/FWBAboutDialog.h b/src/gui/FWBAboutDialog.h
index 4cdb48aba..6068daf23 100644
--- a/src/gui/FWBAboutDialog.h
+++ b/src/gui/FWBAboutDialog.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 *****************************************************************************/
 
+#include "global.h"
 #include <ui_aboutdialog_q.h>
 
 #include "fwbuilder/Constants.h"
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 2da732cd5..838b9de97 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -20,10 +20,10 @@ exists(qmake.inc){
 # for every module. There is no need to #include file fwbuilder_ph.h
 # in each module since it will be included by means of -include option.
 #
-PRECOMPILED_HEADER = fwbuilder_ph.h
+# PRECOMPILED_HEADER = fwbuilder_ph.h
 
 # control whether we build debug or release in ../../qmake.inc
-CONFIG += precompile_header
+# CONFIG += precompile_header
 
 HEADERS += ../../config.h \
     FWWindow.h \
diff --git a/src/gui/instDialog_compile.cpp b/src/gui/instDialog_compile.cpp
index d5b5e101f..25b4bc000 100644
--- a/src/gui/instDialog_compile.cpp
+++ b/src/gui/instDialog_compile.cpp
@@ -52,6 +52,7 @@
 #include <QTextCodec>
 #include <QTimer>
 #include <QMessageBox>
+#include <QFile>
 
 using namespace std;
 using namespace libfwbuilder;