properly build and install on win32

This commit is contained in:
SVN User
2008-07-13 16:40:56 +00:00
parent 24cb23f92f
commit d3113d99a7
11 changed files with 44 additions and 21 deletions
+8 -3
View File
@@ -4,10 +4,15 @@
include(../qmake.inc) include(../qmake.inc)
win32 { win32 {
QMAKE_RUN_CC = @echo CONFIG -= embed_manifest_exe
QMAKE_RUN_CXX = @echo
QMAKE_LINK = @echo
} }
win32 {
QMAKE_RUN_CC = echo
QMAKE_RUN_CXX = echo
QMAKE_LINK = echo
}
!win32 { !win32 {
QMAKE_RUN_CC = @echo > /dev/null QMAKE_RUN_CC = @echo > /dev/null
QMAKE_RUN_CXX = @echo > /dev/null QMAKE_RUN_CXX = @echo > /dev/null
+4
View File
@@ -71,6 +71,10 @@ unix {
} }
} }
win32 {
CONFIG -= debug
}
exists(qmake2.inc) { exists(qmake2.inc) {
include( qmake2.inc) include( qmake2.inc)
} }
+4
View File
@@ -71,6 +71,10 @@ unix {
} }
} }
win32 {
CONFIG -= debug
}
exists(qmake2.inc) { exists(qmake2.inc) {
include(qmake2.inc) include(qmake2.inc)
} }
+3 -1
View File
@@ -323,7 +323,9 @@ contains( HAVE_ANTLR_RUNTIME, 1 ){
DEFINES += $$ANTLR_DEFINES DEFINES += $$ANTLR_DEFINES
} }
QMAKE_COPY = ../../install.sh -m 0755 -s !win32 {
QMAKE_COPY = ../../install.sh -m 0755 -s
}
RESOURCES += MainRes.qrc RESOURCES += MainRes.qrc
+2 -4
View File
@@ -218,13 +218,11 @@ string OSConfigurator_ios::_printLogging()
return str.str(); 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) ;
} }
+4 -2
View File
@@ -21,13 +21,15 @@ HEADERS = ../../config.h \
../cisco_lib/Helper.h ../cisco_lib/Helper.h
# CONFIG -= qt # CONFIG -= qt
QMAKE_COPY = /usr/bin/install -m 0755 -s !win32 {
QMAKE_COPY = /usr/bin/install -m 0755 -s
}
win32:CONFIG += console win32:CONFIG += console
INCLUDEPATH += ../cisco_lib/ INCLUDEPATH += ../cisco_lib/
win32:LIBS += $$PREFIX/fwbcisco.lib win32:LIBS += ../cisco_lib/release/fwbcisco.lib
!win32:LIBS += ../cisco_lib/libfwbcisco.a !win32:LIBS += ../cisco_lib/libfwbcisco.a
LIBS += $$LIBS_FWCOMPILER LIBS += $$LIBS_FWCOMPILER
+4 -2
View File
@@ -13,14 +13,16 @@ HEADERS = ../../config.h \
../pflib/PolicyCompiler_ipf.h \ ../pflib/PolicyCompiler_ipf.h \
../pflib/PolicyCompiler_pf.h ../pflib/PolicyCompiler_pf.h
QMAKE_COPY = ../../install.sh -m 0755 -s !win32 {
QMAKE_COPY = ../../install.sh -m 0755 -s
}
win32:CONFIG += console win32:CONFIG += console
INCLUDEPATH += "../pflib" INCLUDEPATH += "../pflib"
DEPENDPATH = "../pflib" DEPENDPATH = "../pflib"
win32:LIBS += $$PREFIX/fwbpf.lib win32:LIBS += ../pflib/release/fwbpf.lib
!win32:LIBS += ../pflib/libfwbpf.a !win32:LIBS += ../pflib/libfwbpf.a
LIBS += $$LIBS_FWCOMPILER LIBS += $$LIBS_FWCOMPILER
+4 -2
View File
@@ -13,14 +13,16 @@ HEADERS = ../../config.h \
../pflib/PolicyCompiler_ipfw.h \ ../pflib/PolicyCompiler_ipfw.h \
../pflib/PolicyCompiler_pf.h ../pflib/PolicyCompiler_pf.h
QMAKE_COPY = ../../install.sh -m 0755 -s !win32 {
QMAKE_COPY = ../../install.sh -m 0755 -s
}
win32:CONFIG += console win32:CONFIG += console
INCLUDEPATH += "../pflib" INCLUDEPATH += "../pflib"
DEPENDPATH = "../pflib" DEPENDPATH = "../pflib"
win32:LIBS += $$PREFIX/fwbpf.lib win32:LIBS += ../pflib/release/fwbpf.lib
!win32:LIBS += ../pflib/libfwbpf.a !win32:LIBS += ../pflib/libfwbpf.a
LIBS += $$LIBS_FWCOMPILER LIBS += $$LIBS_FWCOMPILER
+3 -1
View File
@@ -29,7 +29,9 @@ HEADERS = ../../config.h \
OSConfigurator_linux24.h \ OSConfigurator_linux24.h \
OSData.h OSData.h
QMAKE_COPY = ../../install.sh -m 0755 -s !win32 {
QMAKE_COPY = ../../install.sh -m 0755 -s
}
win32:CONFIG += console win32:CONFIG += console
+4 -4
View File
@@ -10,15 +10,15 @@ HEADERS = ../../config.h \
../pflib/OSConfigurator_openbsd.h \ ../pflib/OSConfigurator_openbsd.h \
../pflib/PolicyCompiler_pf.h ../pflib/PolicyCompiler_pf.h
!win32 {
QMAKE_COPY = ../../install.sh -m 0755 -s QMAKE_COPY = ../../install.sh -m 0755 -s
}
win32:CONFIG += console win32:CONFIG += console
INCLUDEPATH += "../pflib" INCLUDEPATH += "../pflib"
win32:LIBS += $$PREFIX/fwbpf.lib win32:LIBS += ../pflib/release/fwbpf.lib
!win32:LIBS += ../pflib/libfwbpf.a !win32:LIBS += ../pflib/libfwbpf.a
LIBS += $$LIBS_FWCOMPILER LIBS += $$LIBS_FWCOMPILER
+4 -2
View File
@@ -28,13 +28,15 @@ HEADERS = ../../config.h \
../cisco_lib/Helper.h ../cisco_lib/Helper.h
# CONFIG -= qt # CONFIG -= qt
QMAKE_COPY = /usr/bin/install -m 0755 -s !win32 {
QMAKE_COPY = /usr/bin/install -m 0755 -s
}
win32:CONFIG += console win32:CONFIG += console
INCLUDEPATH += ../cisco_lib/ INCLUDEPATH += ../cisco_lib/
win32:LIBS += $$PREFIX/fwbcisco.lib win32:LIBS += ../cisco_lib/release/fwbcisco.lib
!win32:LIBS += ../cisco_lib/libfwbcisco.a !win32:LIBS += ../cisco_lib/libfwbcisco.a
LIBS += $$LIBS_FWCOMPILER LIBS += $$LIBS_FWCOMPILER