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

rearrange the order of libraries to make it compile on Mandriva. See #1085

Browse Source
This commit is contained in:
Vadim Kurland 2010-01-16 01:49:25 +00:00
parent 2e27954947
commit 3d4eea369c
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 2352
#define BUILD_NUM 2353

13
src/gui/gui.pro
View File

@ -455,7 +455,6 @@ contains( HAVE_ANTLR_RUNTIME, 1 ) {
$$ANTLR_LIBS
DEFINES += $$ANTLR_DEFINES
}
LIBS += $$LIBS_FWCOMPILER
# fwtransfer lib. Add this before adding -lQtDBus to LIBS below
LIBS += $$FWTRANSFER_LIB
@ -498,12 +497,16 @@ win32:PRE_TARGETDEPS = ../common/release/common.lib \
../cisco_lib/libfwbcisco.a \
../compiler_lib/libcompilerdriver.a
macx:LIBS += -framework Carbon
LIBS += $$LIBS_FWCOMPILER
RESOURCES += MainRes.qrc
TRANSLATIONS = fwbuilder_ru.ts \
fwbuilder_ja.ts
TRANSLATIONS = fwbuilder_ru.ts fwbuilder_ja.ts
ja.path = $$PKGLOCALEDIR
ja.files = fwbuilder_ja.qm
ru.path = $$PKGLOCALEDIR
ru.files = fwbuilder_ru.qm
INSTALLS += ja \
ru
INSTALLS += ja ru

4
src/ipt/ipt.pro
View File

@ -12,8 +12,6 @@ HEADERS = ../../config.h
win32: CONFIG += console
LIBS += $$LIBS_FWCOMPILER
INCLUDEPATH += ../common ../iptlib ../compiler_lib/
DEPENDPATH = ../common ../iptlib ../compiler_lib
@ -23,6 +21,8 @@ win32:LIBS += ../common/release/common.lib ../iptlib/release/iptlib.lib ../comp
win32:PRE_TARGETDEPS = ../common/release/common.lib ../iptlib/release/iptlib.lib ../compiler_lib/release/compilerdriver.lib
!win32:PRE_TARGETDEPS = ../common/libcommon.a ../iptlib/libiptlib.a ../compiler_lib/libcompilerdriver.a
LIBS += $$LIBS_FWCOMPILER
TARGET = fwb_ipt