Changeset 6049 in ntrip

Timestamp:

Sep 6, 2014, 4:04:05 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (4 diffs)
• src.pri (modified) (2 diffs)

trunk/BNC/src/bnccore.cpp

@@ -51 +51 @@
 #include "rinex/rnxobsfile.h" 
 #include "rinex/rnxnavfile.h" 
-
-#ifdef USE_PPP
-#  include "PPP/pppMain.h"
-#endif
+#include "PPP/pppMain.h"
 
 #ifdef USE_COMBINATION
@@ -131 +128 @@
   _mainWindow = 0;
 
-#ifdef USE_PPP
   _pppMain = new BNC_PPP::t_pppMain();
-#endif
   qRegisterMetaType< QVector<double> >("QVector<double>");
   qRegisterMetaType<bncTime>("bncTime");
@@ -879 +874 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::startPPP() {
-#ifdef USE_PPP
   _pppMain->start();
-#endif
 }
 
@@ -887 +880 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::stopPPP() {
-#ifdef USE_PPP
   _pppMain->stop();
   emit stopRinexPPP();
-#endif
-}
+}

trunk/BNC/src/src.pri

@@ -117 +117 @@
 
 exists(PPPxx) {
-  DEFINES += USE_PPP
   HEADERS += PPP/pppClient.h    PPP/pppObsPool.h   PPP/pppEphPool.h   \
              PPP/pppStation.h   PPP/pppFilter.h    PPP/pppParlist.h   \
@@ -124 +123 @@
              PPP/pppStation.cpp PPP/pppFilter.cpp  PPP/pppParlist.cpp \
              PPP/pppSatObs.cpp      
+}
+else {
+  HEADERS += PPP_free/pppClient.h
+  SOURCES += PPP_free/pppClient.cpp
 }