Ignore:
Timestamp:
10/06/06 17:23:49 (18 years ago)
Author:
bittner
Message:

merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp

    r1545 r1579  
    11#ifdef GTP_INTERNAL 
    2         #define USE_QT 1 
     2#define USE_QT 1 
    33#else 
    4         #define USE_QT 0 
    5 #endif 
    6  
    7 #if USE_QT 
    8 #define USE_BOOST 0 
    9 #else 
    10 #define USE_BOOST 1 
    11 #endif 
     4#define USE_QT 0 
     5#endif 
     6 
     7#define USE_THREADS 1 
    128 
    139#ifdef UNICODE 
     
    2723 
    2824#include "PreprocessorThread.h" 
    29 #if USE_BOOST 
     25 
     26#if !USE_QT && USE_THREADS 
    3027#include "BoostPreprocessorThread.h" 
    3128#endif 
     
    183180        pt = new QtPreprocessorThread(preprocessor); 
    184181#else 
    185 #if USE_BOOST 
     182#if USE_THREADS 
    186183        pt = new BoostPreprocessorThread(preprocessor); 
    187184#else 
    188185        pt = new PreprocessorThread(preprocessor); 
    189 #endif   
     186#endif 
    190187#endif 
    191188 
Note: See TracChangeset for help on using the changeset viewer.