Changeset 6591 in ntrip

Timestamp:

Feb 17, 2015, 3:00:58 PM (9 years ago)

Author:

mervart

Message:

 

File:

• trunk/GnssCenter/monitor/monitor.pro (modified) (2 diffs)

trunk/GnssCenter/monitor/monitor.pro

@@ -2 +2 @@
 TEMPLATE             = lib
 CONFIG              += plugin debug
+QT                  += svg
 TARGET               = $$qtLibraryTarget(gnsscenter_monitor)
-QT                  += svg
-INCLUDEPATH         += ../qwt ../main
 DESTDIR              = ../plugins
-QMAKE_LIBDIR        += ../qwt $(HOME)/Software/thrift/lib
-LIBS                 = -lqwt -lthrift
-INCLUDEPATH         += $(HOME)/Software/thrift/include/thrift
 DEFINES             += HAVE_INTTYPES_H HAVE_NETINET_IN_H
 
@@ -16 +12 @@
 release:MOC_DIR     = .moc/release
 
+THRIFT_ROOT = $(HOME)/Software/thrift
+
+INCLUDEPATH         += ../main ../qwt $$THRIFT_ROOT/include
+QMAKE_LIBDIR        += ../qwt $$THRIFT_ROOT/lib
+LIBS                 = -lqwt -lthrift
+
 thrift.target   = gen-cpp
-thrift.commands = "thrift -r -gen cpp $(THRIFT_DIR)/rtnet.thrift"
+thrift.commands = "$$THRIFT_ROOT/bin/thrift -r -gen cpp $(THRIFT_DIR)/rtnet.thrift"
 thrift.depends  = $(THRIFT_DIR)/rtnet.thrift $(THRIFT_DIR)/rtnet_data.thrift