Changeset 6049 in ntrip


Ignore:
Timestamp:
Sep 6, 2014, 4:04:05 PM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnccore.cpp

    r6043 r6049  
    5151#include "rinex/rnxobsfile.h"
    5252#include "rinex/rnxnavfile.h"
    53 
    54 #ifdef USE_PPP
    55 #  include "PPP/pppMain.h"
    56 #endif
     53#include "PPP/pppMain.h"
    5754
    5855#ifdef USE_COMBINATION
     
    131128  _mainWindow = 0;
    132129
    133 #ifdef USE_PPP
    134130  _pppMain = new BNC_PPP::t_pppMain();
    135 #endif
    136131  qRegisterMetaType< QVector<double> >("QVector<double>");
    137132  qRegisterMetaType<bncTime>("bncTime");
     
    879874////////////////////////////////////////////////////////////////////////////
    880875void t_bncCore::startPPP() {
    881 #ifdef USE_PPP
    882876  _pppMain->start();
    883 #endif
    884877}
    885878
     
    887880////////////////////////////////////////////////////////////////////////////
    888881void t_bncCore::stopPPP() {
    889 #ifdef USE_PPP
    890882  _pppMain->stop();
    891883  emit stopRinexPPP();
    892 #endif
    893 }
     884}
  • trunk/BNC/src/src.pri

    r6047 r6049  
    117117
    118118exists(PPPxx) {
    119   DEFINES += USE_PPP
    120119  HEADERS += PPP/pppClient.h    PPP/pppObsPool.h   PPP/pppEphPool.h   \
    121120             PPP/pppStation.h   PPP/pppFilter.h    PPP/pppParlist.h   \
     
    124123             PPP/pppStation.cpp PPP/pppFilter.cpp  PPP/pppParlist.cpp \
    125124             PPP/pppSatObs.cpp     
     125}
     126else {
     127  HEADERS += PPP_free/pppClient.h
     128  SOURCES += PPP_free/pppClient.cpp
    126129}
    127130
Note: See TracChangeset for help on using the changeset viewer.