onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-25 04:37:22 +01:00
Code Issues Releases Wiki Activity

fixed #1840: fixed build on Mandriva

Browse Source 
2010, all static libraries should go first on the linker command
line.
This commit is contained in:
Vadim Kurland 2010-11-11 13:32:50 -08:00
parent 8351f7640b
commit 5f99554ae3
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/ChangeLog
View File

@ -1,3 +1,9 @@
2010-11-11 Vadim Kurland <vadim@vk.crocodile.org>
* src/gui/gui.pro (LIBS): fixed #1840: fixed build on Mandriva
2010, all static libraries should go first on the linker command
line.
2010-11-10 Vadim Kurland <vadim@vk.crocodile.org>
* NATCompiler_ipt.cpp (processNext): fixed SF bug 3103582 "Cant

26
src/gui/gui.pro
View File

@ -9,24 +9,25 @@ exists(qmake.inc):include( qmake.inc)
SOURCES += main.cpp
# libgui goes first
win32:LIBS += ../libgui/release/gui.lib
!win32:LIBS += ../libgui/libgui.a
# Arrange static libraries before dynamic ones in the linker command
# line. libgui goes first
win32:STATIC_LIBS += ../libgui/release/gui.lib
!win32:STATIC_LIBS += ../libgui/libgui.a
INCLUDEPATH += $$ANTLR_INCLUDEPATH
LIBS += $$FWBPARSER_LIB $$ANTLR_LIBS
STATIC_LIBS += $$FWBPARSER_LIB $$ANTLR_LIBS
DEFINES += $$ANTLR_DEFINES
# fwtransfer lib. Add this before adding -lQtDBus to LIBS below
LIBS += $$FWTRANSFER_LIB
STATIC_LIBS += $$FWTRANSFER_LIB
contains( HAVE_QTDBUS, 1 ):unix {
!macx:QT += network \
dbus
macx:LIBS += -framework \
macx:STATIC_LIBS += -framework \
QtDBus
}
# !macx:LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
# !macx:STATIC_LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
INCLUDEPATH += \
../common \
../iptlib \
@ -46,14 +47,14 @@ DEPENDPATH = \
../compiler_lib \
../libgui
win32:LIBS += \
win32:STATIC_LIBS += \
../common/release/common.lib \
../iptlib/release/iptlib.lib \
../pflib/release/fwbpf.lib \
../cisco_lib/release/fwbcisco.lib \
../compiler_lib/release/compilerdriver.lib
!win32:LIBS += \
!win32:STATIC_LIBS += \
../common/libcommon.a \
../iptlib/libiptlib.a \
../pflib/libfwbpf.a \
@ -77,9 +78,12 @@ win32:PRE_TARGETDEPS = \
../compiler_lib/libcompilerdriver.a \
$$FWBPARSER_LIB
macx:LIBS += -framework \
macx:STATIC_LIBS += -framework \
Carbon
LIBS += $$LIBS_FWCOMPILER
STATIC_LIBS += $$LIBS_FWCOMPILER
LIBS = $$STATIC_LIBS $$LIBS
#RESOURCES += ../libgui/MainRes.qrc
TRANSLATIONS = fwbuilder_ru.ts \
fwbuilder_ja.ts \