Changeset 98 in pacpusframework for branches

Timestamp:

May 23, 2013, 5:34:11 PM (12 years ago)

Author:

morasjul

Message:

2.0 windows fix

Location:

branches/2.0-beta1

Files:

• include/Pacpus/kernel/PacpusEvent.h (modified) (1 diff)
• src/DBITEPlayerLib/CMakeLists.txt (modified) (2 diffs)
• src/FileLib/CMakeLists.txt (modified) (2 diffs)
• src/PacpusLib/CMakeLists.txt (modified) (3 diffs)

branches/2.0-beta1/include/Pacpus/kernel/PacpusEvent.h

@@ -40 +40 @@
     virtual ~PacpusEvent() {}
 
-    virtual QDataStream& streamOut(QDataStream& out) {}; // NOTE virtual pure ??
-    virtual QDataStream& streamIn(QDataStream& in) {};
+    virtual QDataStream& streamOut(QDataStream& out) {return out;}; // NOTE virtual pure ??
+    virtual QDataStream& streamIn(QDataStream& in) {return in;};
 
 public: // TODO make protected

branches/2.0-beta1/src/DBITEPlayerLib/CMakeLists.txt

@@ -94 +94 @@
     FileLib
     PacpusTools
+        #optimized FileLib debug FileLib_d
+        #optimized PacpusTools debug PacpusTools_d
     ${QT_LIBRARIES}
 )
@@ -101 +103 @@
         ${PROJECT_NAME}
         ROAD_TIME
+                #optimized ROAD_TIME debug ROAD_TIME_d
         Winmm
     )

branches/2.0-beta1/src/FileLib/CMakeLists.txt

@@ -14 +14 @@
 add_definitions(
     -DFILELIB_EXPORTS
+)
+
+# ========================================
+# Link directories
+# ========================================
+link_directories(
+        ${PROJECT_BINARY_DIR}/../PacpusLib
 )
 
@@ -45 +52 @@
 target_link_libraries(
     ${PROJECT_NAME}
-        PacpusLib
+    #optimized PacpusLib debug PacpusLib_d
+        PacpusLib
 )
 endif()

branches/2.0-beta1/src/PacpusLib/CMakeLists.txt

@@ -37 +37 @@
 
 # ========================================
+# Link directories
+# ========================================
+link_directories(
+        ${PROJECT_BINARY_DIR}/../RoadTime
+)
+
+# ========================================
 # List of sources
 # ========================================
@@ -57 +64 @@
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/inputOutputInterface.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/PacpusEvent.h
-    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/CommunicationComponent.h
+    #${PACPUS_INCLUDE_DIR}/Pacpus/kernel/CommunicationComponent.h
 
     ./ComponentBase.cpp
@@ -89 +96 @@
 
 if(UNIX)
-set(LIBS
-    FileLib
-)
+        set(LIBS optimized FileLib debug FileLib_d)
+else()
+    set(LIBS 
+        #optimized ROAD_TIME debug ROAD_TIME_d # TODO why debug not found ?
+        ROAD_TIME
+        )
 endif()