From d3113d99a7d54596b1a77d59982e617fb51a0825 Mon Sep 17 00:00:00 2001 From: SVN User Date: Sun, 13 Jul 2008 16:40:56 +0000 Subject: [PATCH] properly build and install on win32 --- doc/doc.pro | 11 ++++++++--- qmake.inc | 4 ++++ qmake.inc.in | 4 ++++ src/gui/gui.pro | 4 +++- src/iosacl/OSConfigurator_ios.cpp | 6 ++---- src/iosacl/iosacl.pro | 6 ++++-- src/ipf/ipf.pro | 6 ++++-- src/ipfw/ipfw.pro | 6 ++++-- src/ipt/ipt.pro | 4 +++- src/pf/pf.pro | 8 ++++---- src/pix/pix.pro | 6 ++++-- 11 files changed, 44 insertions(+), 21 deletions(-) diff --git a/doc/doc.pro b/doc/doc.pro index cdafc5ded..07aa4e1ac 100644 --- a/doc/doc.pro +++ b/doc/doc.pro @@ -4,10 +4,15 @@ include(../qmake.inc) win32 { - QMAKE_RUN_CC = @echo - QMAKE_RUN_CXX = @echo - QMAKE_LINK = @echo + CONFIG -= embed_manifest_exe } + +win32 { + QMAKE_RUN_CC = echo + QMAKE_RUN_CXX = echo + QMAKE_LINK = echo +} + !win32 { QMAKE_RUN_CC = @echo > /dev/null QMAKE_RUN_CXX = @echo > /dev/null diff --git a/qmake.inc b/qmake.inc index f1ec9b12f..22a315a62 100644 --- a/qmake.inc +++ b/qmake.inc @@ -71,6 +71,10 @@ unix { } } +win32 { + CONFIG -= debug +} + exists(qmake2.inc) { include( qmake2.inc) } diff --git a/qmake.inc.in b/qmake.inc.in index 4e7d76aac..f38efa439 100644 --- a/qmake.inc.in +++ b/qmake.inc.in @@ -71,6 +71,10 @@ unix { } } +win32 { + CONFIG -= debug +} + exists(qmake2.inc) { include(qmake2.inc) } diff --git a/src/gui/gui.pro b/src/gui/gui.pro index fcfb1b4aa..c61ffbd9e 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -323,7 +323,9 @@ contains( HAVE_ANTLR_RUNTIME, 1 ){ DEFINES += $$ANTLR_DEFINES } -QMAKE_COPY = ../../install.sh -m 0755 -s +!win32 { + QMAKE_COPY = ../../install.sh -m 0755 -s +} RESOURCES += MainRes.qrc diff --git a/src/iosacl/OSConfigurator_ios.cpp b/src/iosacl/OSConfigurator_ios.cpp index ded8e242f..4178f2854 100644 --- a/src/iosacl/OSConfigurator_ios.cpp +++ b/src/iosacl/OSConfigurator_ios.cpp @@ -218,13 +218,11 @@ string OSConfigurator_ios::_printLogging() return str.str(); } -void OSConfigurator_ios::addVirtualAddressForNAT(const Address *addr) +void OSConfigurator_ios::addVirtualAddressForNAT(const Address*) { - if (addr==NULL) ; } -void OSConfigurator_ios::addVirtualAddressForNAT(const Network *nw) +void OSConfigurator_ios::addVirtualAddressForNAT(const Network*) { - if (nw==NULL) ; } diff --git a/src/iosacl/iosacl.pro b/src/iosacl/iosacl.pro index 7a24f623a..d6b36b1e8 100644 --- a/src/iosacl/iosacl.pro +++ b/src/iosacl/iosacl.pro @@ -21,13 +21,15 @@ HEADERS = ../../config.h \ ../cisco_lib/Helper.h # CONFIG -= qt -QMAKE_COPY = /usr/bin/install -m 0755 -s +!win32 { + QMAKE_COPY = /usr/bin/install -m 0755 -s +} win32:CONFIG += console INCLUDEPATH += ../cisco_lib/ -win32:LIBS += $$PREFIX/fwbcisco.lib +win32:LIBS += ../cisco_lib/release/fwbcisco.lib !win32:LIBS += ../cisco_lib/libfwbcisco.a LIBS += $$LIBS_FWCOMPILER diff --git a/src/ipf/ipf.pro b/src/ipf/ipf.pro index b93c3393f..b09ce5e70 100644 --- a/src/ipf/ipf.pro +++ b/src/ipf/ipf.pro @@ -13,14 +13,16 @@ HEADERS = ../../config.h \ ../pflib/PolicyCompiler_ipf.h \ ../pflib/PolicyCompiler_pf.h -QMAKE_COPY = ../../install.sh -m 0755 -s +!win32 { + QMAKE_COPY = ../../install.sh -m 0755 -s +} win32:CONFIG += console INCLUDEPATH += "../pflib" DEPENDPATH = "../pflib" -win32:LIBS += $$PREFIX/fwbpf.lib +win32:LIBS += ../pflib/release/fwbpf.lib !win32:LIBS += ../pflib/libfwbpf.a LIBS += $$LIBS_FWCOMPILER diff --git a/src/ipfw/ipfw.pro b/src/ipfw/ipfw.pro index 7c578613d..96cbef8c2 100644 --- a/src/ipfw/ipfw.pro +++ b/src/ipfw/ipfw.pro @@ -13,14 +13,16 @@ HEADERS = ../../config.h \ ../pflib/PolicyCompiler_ipfw.h \ ../pflib/PolicyCompiler_pf.h -QMAKE_COPY = ../../install.sh -m 0755 -s +!win32 { + QMAKE_COPY = ../../install.sh -m 0755 -s +} win32:CONFIG += console INCLUDEPATH += "../pflib" DEPENDPATH = "../pflib" -win32:LIBS += $$PREFIX/fwbpf.lib +win32:LIBS += ../pflib/release/fwbpf.lib !win32:LIBS += ../pflib/libfwbpf.a LIBS += $$LIBS_FWCOMPILER diff --git a/src/ipt/ipt.pro b/src/ipt/ipt.pro index 659840195..cc1a324fd 100644 --- a/src/ipt/ipt.pro +++ b/src/ipt/ipt.pro @@ -29,7 +29,9 @@ HEADERS = ../../config.h \ OSConfigurator_linux24.h \ OSData.h -QMAKE_COPY = ../../install.sh -m 0755 -s +!win32 { + QMAKE_COPY = ../../install.sh -m 0755 -s +} win32:CONFIG += console diff --git a/src/pf/pf.pro b/src/pf/pf.pro index 1e421129f..56e4e42fe 100644 --- a/src/pf/pf.pro +++ b/src/pf/pf.pro @@ -10,15 +10,15 @@ HEADERS = ../../config.h \ ../pflib/OSConfigurator_openbsd.h \ ../pflib/PolicyCompiler_pf.h - -QMAKE_COPY = ../../install.sh -m 0755 -s - +!win32 { + QMAKE_COPY = ../../install.sh -m 0755 -s +} win32:CONFIG += console INCLUDEPATH += "../pflib" -win32:LIBS += $$PREFIX/fwbpf.lib +win32:LIBS += ../pflib/release/fwbpf.lib !win32:LIBS += ../pflib/libfwbpf.a LIBS += $$LIBS_FWCOMPILER diff --git a/src/pix/pix.pro b/src/pix/pix.pro index 7f33d2eb1..3b57ac8d7 100644 --- a/src/pix/pix.pro +++ b/src/pix/pix.pro @@ -28,13 +28,15 @@ HEADERS = ../../config.h \ ../cisco_lib/Helper.h # CONFIG -= qt -QMAKE_COPY = /usr/bin/install -m 0755 -s +!win32 { + QMAKE_COPY = /usr/bin/install -m 0755 -s +} win32:CONFIG += console INCLUDEPATH += ../cisco_lib/ -win32:LIBS += $$PREFIX/fwbcisco.lib +win32:LIBS += ../cisco_lib/release/fwbcisco.lib !win32:LIBS += ../cisco_lib/libfwbcisco.a LIBS += $$LIBS_FWCOMPILER