Merged Windows port changes from default branch.

This commit is contained in:
Andrew Johnson
2014-04-16 16:29:12 -05:00
27 changed files with 196 additions and 43 deletions

View File

@@ -26,6 +26,7 @@ INC += exampleDatabase.h
LIBRARY += exampleDatabase
exampleDatabase_SRCS += exampleDatabase.cpp
exampleDatabase_SRCS += exampleDatabaseRegister.cpp
exampleDatabase_LIBS += powerSupply
exampleDatabase_LIBS += pvDatabase
exampleDatabase_LIBS += pvAccess
exampleDatabase_LIBS += pvData

View File

@@ -11,10 +11,20 @@
#ifndef EXAMPLEDATABASE_H
#define EXAMPLEDATABASE_H
#include <shareLib.h>
#ifdef epicsExportSharedSymbols
# define exampledatabaseEpicsExportSharedSymbols
# undef epicsExportSharedSymbols
#endif
#include <shareLib.h>
#include <pv/pvDatabase.h>
#ifdef exampledatabaseEpicsExportSharedSymbols
# define epicsExportSharedSymbols
# undef exampledatabaseEpicsExportSharedSymbols
# include <shareLib.h>
#endif
namespace epics { namespace pvDatabase {
class epicsShareClass ExampleDatabase{