mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-09-12 08:02:00 +02:00
fixed build on Mandriva
This commit is contained in:
+1
-1
@@ -57,7 +57,7 @@ unix {
|
|||||||
res_configlets.path = $$res.path/configlets
|
res_configlets.path = $$res.path/configlets
|
||||||
|
|
||||||
# INSTALLS += icns
|
# INSTALLS += icns
|
||||||
LIBS += @LIBS@
|
# LIBS += @LIBS@
|
||||||
|
|
||||||
PKGLOCALEDIR = $$res.path/locale
|
PKGLOCALEDIR = $$res.path/locale
|
||||||
|
|
||||||
|
|||||||
@@ -19,8 +19,9 @@ DEPENDPATH = ../common \
|
|||||||
../libfwbuilder/src/fwbuilder \
|
../libfwbuilder/src/fwbuilder \
|
||||||
../libfwbuilder/src/fwcompiler
|
../libfwbuilder/src/fwcompiler
|
||||||
|
|
||||||
!win32:LIBS += ../common/libcommon.a \
|
!win32:LIBS = ../common/libcommon.a \
|
||||||
../libfwbuilder/src/fwbuilder/libfwbuilder.a
|
../libfwbuilder/src/fwbuilder/libfwbuilder.a \
|
||||||
|
$$LIBS
|
||||||
|
|
||||||
!win32:PRE_TARGETDEPS = ../common/libcommon.a \
|
!win32:PRE_TARGETDEPS = ../common/libcommon.a \
|
||||||
../libfwbuilder/src/fwbuilder/libfwbuilder.a
|
../libfwbuilder/src/fwbuilder/libfwbuilder.a
|
||||||
|
|||||||
@@ -26,11 +26,12 @@ win32:LIBS += ../common/release/common.lib \
|
|||||||
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
||||||
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
||||||
|
|
||||||
!win32:LIBS += ../common/libcommon.a \
|
!win32:LIBS = ../common/libcommon.a \
|
||||||
../cisco_lib/libfwbcisco.a \
|
../cisco_lib/libfwbcisco.a \
|
||||||
../compiler_lib/libcompilerdriver.a \
|
../compiler_lib/libcompilerdriver.a \
|
||||||
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
||||||
../libfwbuilder/src/fwbuilder/libfwbuilder.a
|
../libfwbuilder/src/fwbuilder/libfwbuilder.a \
|
||||||
|
$$LIBS
|
||||||
|
|
||||||
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
||||||
../cisco_lib/release/fwbcisco.lib \
|
../cisco_lib/release/fwbcisco.lib \
|
||||||
|
|||||||
+3
-2
@@ -24,11 +24,12 @@ win32:LIBS += ../common/release/common.lib \
|
|||||||
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
||||||
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
||||||
|
|
||||||
!win32:LIBS += ../common/libcommon.a \
|
!win32:LIBS = ../common/libcommon.a \
|
||||||
../pflib/libfwbpf.a \
|
../pflib/libfwbpf.a \
|
||||||
../compiler_lib/libcompilerdriver.a \
|
../compiler_lib/libcompilerdriver.a \
|
||||||
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
||||||
../libfwbuilder/src/fwbuilder/libfwbuilder.a
|
../libfwbuilder/src/fwbuilder/libfwbuilder.a \
|
||||||
|
$$LIBS
|
||||||
|
|
||||||
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
||||||
../pflib/release/fwbpf.lib \
|
../pflib/release/fwbpf.lib \
|
||||||
|
|||||||
+3
-2
@@ -22,11 +22,12 @@ win32:LIBS += ../common/release/common.lib \
|
|||||||
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
||||||
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
||||||
|
|
||||||
!win32:LIBS += ../common/libcommon.a \
|
!win32:LIBS = ../common/libcommon.a \
|
||||||
../pflib/libfwbpf.a \
|
../pflib/libfwbpf.a \
|
||||||
../compiler_lib/libcompilerdriver.a \
|
../compiler_lib/libcompilerdriver.a \
|
||||||
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
||||||
../libfwbuilder/src/fwbuilder/libfwbuilder.a
|
../libfwbuilder/src/fwbuilder/libfwbuilder.a \
|
||||||
|
$$LIBS
|
||||||
|
|
||||||
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
||||||
../pflib/release/fwbpf.lib \
|
../pflib/release/fwbpf.lib \
|
||||||
|
|||||||
+3
-2
@@ -22,11 +22,12 @@ win32:LIBS += ../common/release/common.lib \
|
|||||||
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
||||||
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
||||||
|
|
||||||
!win32:LIBS += ../common/libcommon.a \
|
!win32:LIBS = ../common/libcommon.a \
|
||||||
../iptlib/libiptlib.a \
|
../iptlib/libiptlib.a \
|
||||||
../compiler_lib/libcompilerdriver.a \
|
../compiler_lib/libcompilerdriver.a \
|
||||||
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
||||||
../libfwbuilder/src/fwbuilder/libfwbuilder.a
|
../libfwbuilder/src/fwbuilder/libfwbuilder.a \
|
||||||
|
$$LIBS
|
||||||
|
|
||||||
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
||||||
../iptlib/release/iptlib.lib \
|
../iptlib/release/iptlib.lib \
|
||||||
|
|||||||
+3
-2
@@ -22,11 +22,12 @@ win32:LIBS += ../common/release/common.lib \
|
|||||||
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
||||||
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
||||||
|
|
||||||
!win32:LIBS += ../common/libcommon.a \
|
!win32:LIBS = ../common/libcommon.a \
|
||||||
../pflib/libfwbpf.a \
|
../pflib/libfwbpf.a \
|
||||||
../compiler_lib/libcompilerdriver.a \
|
../compiler_lib/libcompilerdriver.a \
|
||||||
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
||||||
../libfwbuilder/src/fwbuilder/libfwbuilder.a
|
../libfwbuilder/src/fwbuilder/libfwbuilder.a \
|
||||||
|
$$LIBS
|
||||||
|
|
||||||
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
||||||
../pflib/release/fwbpf.lib \
|
../pflib/release/fwbpf.lib \
|
||||||
|
|||||||
+3
-2
@@ -20,11 +20,12 @@ win32:LIBS += ../common/release/common.lib \
|
|||||||
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
||||||
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
||||||
|
|
||||||
!win32:LIBS += ../common/libcommon.a \
|
!win32:LIBS = ../common/libcommon.a \
|
||||||
../cisco_lib/libfwbcisco.a \
|
../cisco_lib/libfwbcisco.a \
|
||||||
../compiler_lib/libcompilerdriver.a \
|
../compiler_lib/libcompilerdriver.a \
|
||||||
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
||||||
../libfwbuilder/src/fwbuilder/libfwbuilder.a
|
../libfwbuilder/src/fwbuilder/libfwbuilder.a \
|
||||||
|
$$LIBS
|
||||||
|
|
||||||
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
||||||
../cisco_lib/release/fwbcisco.lib \
|
../cisco_lib/release/fwbcisco.lib \
|
||||||
|
|||||||
@@ -26,11 +26,12 @@ win32:LIBS += ../common/release/common.lib \
|
|||||||
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
|
||||||
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
|
||||||
|
|
||||||
!win32:LIBS += ../common/libcommon.a \
|
!win32:LIBS = ../common/libcommon.a \
|
||||||
../cisco_lib/libfwbcisco.a \
|
../cisco_lib/libfwbcisco.a \
|
||||||
../compiler_lib/libcompilerdriver.a \
|
../compiler_lib/libcompilerdriver.a \
|
||||||
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
||||||
../libfwbuilder/src/fwbuilder/libfwbuilder.a
|
../libfwbuilder/src/fwbuilder/libfwbuilder.a \
|
||||||
|
$$LIBS
|
||||||
|
|
||||||
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
win32:PRE_TARGETDEPS = ../common/release/common.lib \
|
||||||
../cisco_lib/release/fwbcisco.lib \
|
../cisco_lib/release/fwbcisco.lib \
|
||||||
|
|||||||
@@ -17,9 +17,10 @@ contains( HAVE_QTDBUS, 1 ):unix {
|
|||||||
|
|
||||||
!win32 {
|
!win32 {
|
||||||
QMAKE_COPY = ../../../install.sh -m 0755 -s
|
QMAKE_COPY = ../../../install.sh -m 0755 -s
|
||||||
LIBS += ../../fwtransfer/libfwtransfer.a \ # -lQtDBus
|
LIBS = ../../fwtransfer/libfwtransfer.a \ # -lQtDBus
|
||||||
../../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
../../libfwbuilder/src/fwcompiler/libfwcompiler.a \
|
||||||
../../libfwbuilder/src/fwbuilder/libfwbuilder.a
|
../../libfwbuilder/src/fwbuilder/libfwbuilder.a \
|
||||||
|
$$LIBS
|
||||||
}
|
}
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
|
|||||||
Reference in New Issue
Block a user