Changeset 103 in pacpusframework for trunk


Ignore:
Timestamp:
Jun 5, 2013, 5:39:28 PM (11 years ago)
Author:
DHERBOMEZ Gérald
Message:

Correction of link bugs.
Windows build OK.

Location:
trunk
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/Pacpus/PacpusTools/AsyncWorkerBase.h

    r76 r103  
    1818#include <QObject>
    1919
     20#include "Pacpus\kernel\PacpusToolsConfig.h"
     21
    2022namespace pacpus
    2123{
    … …  
    2931   * by external user-defined messages.
    3032   */
    31   class AsyncWorkerBase
     33  class PACPUSTOOLS_API AsyncWorkerBase
    3234    : public QObject
    3335    , private boost::noncopyable

  • trunk/include/Pacpus/PacpusTools/PeriodicWorker.h

    r76 r103  
    1616
    1717// Includes, pacpus.
     18#include "Pacpus\kernel\PacpusToolsConfig.h"
    1819#include <Pacpus/PacpusTools/AsyncWorkerBase.h>
     20
    1921
    2022class QTimer;
    … …  
    3739   *    worker.startWork(1000);
    3840   */
    39   class PeriodicWorker
     41  class PACPUSTOOLS_API PeriodicWorker
    4042    : public AsyncWorkerBase
    4143  {

  • trunk/include/Pacpus/PacpusTools/Win32ShMem.h

    r76 r103  
    1616#define DEF_PACPUS_WIN32SHMEM_H
    1717
     18#include "Pacpus\kernel\PacpusToolsConfig.h"
     19
    1820#include <Pacpus/PacpusTools/ShMemBase.h>
    1921
    … …  
    2426
    2527/// Shared memory object for Windows.
    26 class Win32ShMem
     28class PACPUSTOOLS_API Win32ShMem
    2729        : public ShMemBase
    2830{

  • trunk/scripts/build-msvc.bat

    r91 r103  
    4141cmake .. -DPACPUS_INSTALL_DIR="%1" -DPACPUS_INSTALL_3RD=TRUE -DPACPUS_USE_LOG=TRUE -DPACPUS_INSTALL_WITH_VERSION_NUMBER=TRUE
    4242:: Build in debug and release
    43 msbuild Pacpus.sln /p:Configuration=Debug
    44 msbuild Pacpus.sln /p:Configuration=Release
     43rem msbuild Pacpus.sln /p:Configuration=Debug
     44rem msbuild Pacpus.sln /p:Configuration=Release
    4545:: Install
    46 msbuild INSTALL.vcxproj /p:Configuration=Debug
    47 msbuild INSTALL.vcxproj /p:Configuration=Release
    48 echo Build finished, do not forget to check the MSVC's output
     46rem msbuild INSTALL.vcxproj /p:Configuration=Debug
     47rem msbuild INSTALL.vcxproj /p:Configuration=Release
     48rem echo Build finished, do not forget to check the MSVC's output
    4949
    5050:exit

  • trunk/src/DBITEPlayer/CMakeLists.txt

    r64 r103  
    7474    ${QT_LIBRARIES}
    7575    dbiteplayerlib
    76     FileLib
    77     PacpusLib
    78     PacpusTools
    7976)
    8077# Windows

  • trunk/src/DBITEPlayerLib/CMakeLists.txt

    r88 r103  
    9393target_link_libraries(
    9494    ${PROJECT_NAME}
    95     FileLib
    96     PacpusTools
    97         PacpusLib
     95        ${PACPUS_DEPENDENCIES_LIB}
     96    PacpusLib
     97        FileLib
    9898    ${QT_LIBRARIES}
    9999)

  • trunk/src/FileLib/CMakeLists.txt

    r88 r103  
    4444target_link_libraries(
    4545    ${PROJECT_NAME}
    46     PacpusLib
     46        ${PACPUS_DEPENDENCIES_LIB}
     47                PacpusLib
    4748
    4849)

  • trunk/src/PacpusSensor/CMakeLists.txt

    r64 r103  
    7373target_link_libraries(
    7474    ${PROJECT_NAME}
    75     dbiteplayerlib
    76     FileLib
    77     PacpusLib
    78     PacpusTools
     75        ${PACPUS_DEPENDENCIES_LIB}
    7976    ${QT_LIBRARIES}
     77        PacpusLib
    8078)
    8179# Windows

  • trunk/src/PacpusTools/CMakeLists.txt

    r101 r103  
    2323# ========================================
    2424add_definitions(
     25        -DPACPUSTOOLS_EXPORTS
    2526    ${QT_DEFINITIONS}
    2627)
Note: See TracChangeset for help on using the changeset viewer.