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