Changeset 7298 in ntrip for trunk/BNC/src/src.pri

Timestamp:

Sep 22, 2015, 10:44:09 PM (9 years ago)

Author:

stuerze

Message:

some restructuring

File:

• trunk/BNC/src/src.pri (modified) (7 diffs)

trunk/BNC/src/src.pri

@@ -40 +40 @@
           bncnetquery.h bncnetqueryv1.h bncnetqueryv2.h               \
           bncnetqueryrtp.h bncsettings.h latencychecker.h             \
-          bncipport.h bncnetqueryv0.h bncnetqueryudp.h                \ 
-          bncnetqueryudp0.h bncudpport.h bnctime.h                    \ 
-          bncserialport.h bncnetquerys.h bncfigure.h                  \ 
-          bncfigurelate.h bncversion.h                                \ 
-          bncfigureppp.h bncrawfile.h                                 \ 
+          bncipport.h bncnetqueryv0.h bncnetqueryudp.h                \
+          bncnetqueryudp0.h bncudpport.h bnctime.h                    \
+          bncserialport.h bncnetquerys.h bncfigure.h                  \
+          bncfigurelate.h bncversion.h                                \
+          bncfigureppp.h bncrawfile.h                                 \
           bncmap.h bncantex.h bncephuser.h                            \
           bncoutf.h bncclockrinex.h bncsp3.h bncsinextro.h            \
@@ -65 +65 @@
           rinex/graphwin.h         rinex/polarplot.h                  \
           rinex/availplot.h        rinex/eleplot.h                    \
-          rinex/dopplot.h          orbComp/sp3Comp.h
+          rinex/dopplot.h          orbComp/sp3Comp.h                  \
+          combination/bnccomb.h
 
 HEADERS       += serial/qextserialbase.h serial/qextserialport.h
@@ -71 +72 @@
 win32:HEADERS += serial/win_qextserialport.h
 
-SOURCES =             bncgetthread.cpp  bncwindow.cpp bnctabledlg.cpp \
+SOURCES = bncgetthread.cpp  bncwindow.cpp bnctabledlg.cpp             \
           bnccaster.cpp bncrinex.cpp bnccore.cpp bncutils.cpp         \
           bncconst.cpp bnchtml.cpp bnchlpdlg.cpp bnctableitem.cpp     \
@@ -101 +102 @@
           rinex/graphwin.cpp       rinex/polarplot.cpp                \
           rinex/availplot.cpp      rinex/eleplot.cpp                  \
-          rinex/dopplot.cpp        orbComp/sp3Comp.cpp
+          rinex/dopplot.cpp        orbComp/sp3Comp.cpp                \
+          combination/bnccomb.cpp
 
 SOURCES       += serial/qextserialbase.cpp serial/qextserialport.cpp
@@ -111 +113 @@
 QT += network
 
-exists(combination/bnccomb.h) {
-  DEFINES += USE_COMBINATION
-  HEADERS += combination/bnccomb.h
-  SOURCES += combination/bnccomb.cpp
-}
-
 exists(PPP) {
   INCLUDEPATH += PPP
@@ -122 +118 @@
   HEADERS += PPP/pppClient.h    PPP/pppObsPool.h   PPP/pppEphPool.h   \
              PPP/pppStation.h   PPP/pppFilter.h    PPP/pppParlist.h   \
-             PPP/pppSatObs.h           
+             PPP/pppSatObs.h
   SOURCES += PPP/pppClient.cpp  PPP/pppObsPool.cpp PPP/pppEphPool.cpp \
-             PPP/pppStation.cpp PPP/pppFilter.cpp  PPP/pppParlist.cpp \ 
-             PPP/pppSatObs.cpp      
+             PPP/pppStation.cpp PPP/pppFilter.cpp  PPP/pppParlist.cpp \
+             PPP/pppSatObs.cpp
 }
 else {
@@ -149 +145 @@
 
 macx {
-  exists("$$[QT_INSTALL_LIBS]/QtWebKit.framework") { 
+  exists("$$[QT_INSTALL_LIBS]/QtWebKit.framework") {
     DEFINES += QT_WEBKIT
   }