Changeset 98 in pacpusframework


Ignore:
Timestamp:
May 23, 2013, 5:34:11 PM (11 years ago)
Author:
morasjul
Message:

2.0 windows fix

Location:
branches/2.0-beta1
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0-beta1/include/Pacpus/kernel/PacpusEvent.h

    r96 r98  
    4040    virtual ~PacpusEvent() {}
    4141
    42     virtual QDataStream& streamOut(QDataStream& out) {}; // NOTE virtual pure ??
    43     virtual QDataStream& streamIn(QDataStream& in) {};
     42    virtual QDataStream& streamOut(QDataStream& out) {return out;}; // NOTE virtual pure ??
     43    virtual QDataStream& streamIn(QDataStream& in) {return in;};
    4444
    4545public: // TODO make protected
  • branches/2.0-beta1/src/DBITEPlayerLib/CMakeLists.txt

    r89 r98  
    9494    FileLib
    9595    PacpusTools
     96        #optimized FileLib debug FileLib_d
     97        #optimized PacpusTools debug PacpusTools_d
    9698    ${QT_LIBRARIES}
    9799)
     
    101103        ${PROJECT_NAME}
    102104        ROAD_TIME
     105                #optimized ROAD_TIME debug ROAD_TIME_d
    103106        Winmm
    104107    )
  • branches/2.0-beta1/src/FileLib/CMakeLists.txt

    r96 r98  
    1414add_definitions(
    1515    -DFILELIB_EXPORTS
     16)
     17
     18# ========================================
     19# Link directories
     20# ========================================
     21link_directories(
     22        ${PROJECT_BINARY_DIR}/../PacpusLib
    1623)
    1724
     
    4552target_link_libraries(
    4653    ${PROJECT_NAME}
    47         PacpusLib
     54    #optimized PacpusLib debug PacpusLib_d
     55        PacpusLib
    4856)
    4957endif()
  • branches/2.0-beta1/src/PacpusLib/CMakeLists.txt

    r96 r98  
    3737
    3838# ========================================
     39# Link directories
     40# ========================================
     41link_directories(
     42        ${PROJECT_BINARY_DIR}/../RoadTime
     43)
     44
     45# ========================================
    3946# List of sources
    4047# ========================================
     
    5764    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/inputOutputInterface.h
    5865    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/PacpusEvent.h
    59     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/CommunicationComponent.h
     66    #${PACPUS_INCLUDE_DIR}/Pacpus/kernel/CommunicationComponent.h
    6067
    6168    ./ComponentBase.cpp
     
    8996
    9097if(UNIX)
    91 set(LIBS
    92     FileLib
    93 )
     98        set(LIBS optimized FileLib debug FileLib_d)
     99else()
     100    set(LIBS
     101        #optimized ROAD_TIME debug ROAD_TIME_d # TODO why debug not found ?
     102        ROAD_TIME
     103        )
    94104endif()
    95105
Note: See TracChangeset for help on using the changeset viewer.