onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-12 08:02:00 +02:00
Code Issues Releases Wiki Activity

moved common definitions to unix scope

Browse Source
This commit is contained in:
vadim
2010-12-29 13:12:10 -08:00
parent 18377b1ff2
commit 51fa3ce866
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libfwbuilder/qmake.inc.in
+11 -9
View File
@@ -13,6 +13,12 @@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
CPPUNIT_LIBS = @CPPUNIT_LIBS@ CPPUNIT_LIBS = @CPPUNIT_LIBS@
unix { unix {
CONFIG += warn_on debug
UI_DIR = .ui
MOC_DIR = .moc
OBJECTS_DIR = .obj
prefix = @prefix@ prefix = @prefix@
QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX
@@ -20,11 +26,12 @@ unix {
INCLUDEPATH += /usr/include @XML_CFLAGS_Q@ @XSLT_CFLAGS_Q@ @PTHREAD_CFLAGS_Q@ INCLUDEPATH += /usr/include @XML_CFLAGS_Q@ @XSLT_CFLAGS_Q@ @PTHREAD_CFLAGS_Q@
LIBS += @PTHREAD_LIBS@ @XML_LIBS@ @XSLT_LIBS@ @LIBSNMP_LIBS@ @LIB_RESOLV@ @LIBS@ LIBS += @PTHREAD_LIBS@ @XML_LIBS@ @XSLT_LIBS@ @LIBSNMP_LIBS@ @LIB_RESOLV@ @LIBS@
!macx { QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
UI_DIR = .ui QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
MOC_DIR = .moc QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
OBJECTS_DIR = .obj QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
!macx {
exec_prefix = @EXEC_PREFIX@ exec_prefix = @EXEC_PREFIX@
DESTDIR = DESTDIR =
@@ -33,11 +40,6 @@ unix {
migration.path = @RES_DIR@/migration migration.path = @RES_DIR@/migration
doc.path = @DOCDIR@ doc.path = @DOCDIR@
CONFIG += warn_on debug
QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
} }
} }