Build csp core and csp engine as DLLs

Signed-off-by: Adam Glustein <[email protected]>

Author: AdamGlustein

cpp/csp/core/BasicAllocator.h

@@ -15,7 +15,7 @@ namespace csp
 {
 
 // Extremely basic non-thread safe fixed-size allocator
-class CSPIMPL_EXPORT BasicAllocator
+class CSPCORE_EXPORT BasicAllocator
 {
 public:
     //elemsize is size of a single alloc, blockSize is number of elements to 

cpp/csp/core/CMakeLists.txt

@@ -1,3 +1,5 @@
+include(GenerateExportHeader)
+
 set(CORE_PUBLIC_HEADERS
       BasicAllocator.h
       Config.h.in
@@ -25,12 +27,17 @@ set(CORE_SOURCE_FILES
 
 configure_file(Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/cpp/csp/core/Config.h)
 
-add_library(csp_core STATIC ${CORE_SOURCE_FILES})
+add_library(csp_core SHARED ${CORE_SOURCE_FILES})
+generate_export_header(csp_core
+        BASE_NAME cspcore
+        EXPORT_MACRO_NAME CSPCORE_EXPORT
+)
 set_target_properties(csp_core PROPERTIES PUBLIC_HEADER "${CORE_PUBLIC_HEADERS}")
 
 install(TARGETS csp_core
         PUBLIC_HEADER DESTINATION include/csp/core
         RUNTIME DESTINATION ${CSP_RUNTIME_INSTALL_SUBDIR}
         LIBRARY DESTINATION lib/
        )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cpp/csp/core/Config.h DESTINATION include/csp/core)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cpp/csp/core/Config.h DESTINATION include/csp/core)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cspcore_export.h DESTINATION include/csp/core)

cpp/csp/core/DynamicBitSet.h

@@ -9,7 +9,7 @@ namespace csp
 {
 
 template<typename NodeT = uint64_t, typename IndexT = int32_t>
-class CSPIMPL_EXPORT DynamicBitSet
+class CSPCORE_EXPORT DynamicBitSet
 {
 
 public:

cpp/csp/core/Enum.h

@@ -73,7 +73,7 @@ bool UnknownOnInvalidValue(long) { return false; }
 
 START_PACKED
 template<typename EnumTraits>
-struct CSPTYPESIMPL_EXPORT Enum : public EnumTraits
+struct CSPCORE_EXPORT Enum : public EnumTraits
 {
     using EnumV = typename EnumTraits::_enum;
     using Mapping = std::vector<std::string>;

cpp/csp/core/EnumBitSet.h

@@ -14,7 +14,7 @@ namespace csp
 //Utility class to hold enums as a bitmask ( where enum values are incremental from 0 )
 //enum must have a NUM_TYPES entry for number of entries
 template< typename EnumT >
-class CSPTYPESIMPL_EXPORT EnumBitSet
+class CSPCORE_EXPORT EnumBitSet
 {
     using value_type = uint64_t;
 

cpp/csp/core/Generator.h

@@ -7,7 +7,7 @@
 namespace csp
 {
 template< typename V, typename ...Args >
-class CSPIMPL_EXPORT Generator
+class CSPCORE_EXPORT Generator
 {
 public:
     using Ptr = std::shared_ptr<Generator<V, Args...>>;

cpp/csp/core/Platform.h

@@ -5,6 +5,10 @@
 #include <time.h>
 
 // cmake autogenerated export files
+#include <csp/core/cspcore_export.h>
+#include <csp/engine/cspengine_export.h>
+#include <csp/engine/csptypes_export.h>
+
 #include <csp/python/cspimpl_export.h>
 #include <csp/python/csptypesimpl_export.h>
 

cpp/csp/core/QueueWaiter.h

@@ -14,7 +14,7 @@ namespace csp
 
 class TimeDelta;
 
-class CSPIMPL_EXPORT QueueWaiter
+class CSPCORE_EXPORT QueueWaiter
 {
 public:
     QueueWaiter() : m_eventsPending( false )

cpp/csp/core/TaggedPointerUnion.h

@@ -26,7 +26,7 @@ struct IndexOf<T, TypeList<TOther, Ts...> >
 
 
 template<typename... Ts>
-class CSPIMPL_EXPORT TaggedPointerUnion
+class CSPCORE_EXPORT TaggedPointerUnion
 {
 public:
     static inline constexpr size_t NUM_TAGS = sizeof...(Ts);

cpp/csp/core/Time.h

@@ -21,7 +21,7 @@ const int64_t NANOS_PER_SECOND      = 1000000000;
 const int64_t SECONDS_PER_DAY       = 86400;
 const int64_t NANOS_PER_DAY         = NANOS_PER_SECOND * SECONDS_PER_DAY;
 
-class CSPTYPESIMPL_EXPORT TimeDelta
+class CSPCORE_EXPORT TimeDelta
 {
 public:
     constexpr TimeDelta() : TimeDelta( TimeDelta::NONE() ) {}
@@ -165,7 +165,7 @@ inline std::ostream & operator <<( std::ostream &os, const TimeDelta & d )
     return os;
 }
 
-class CSPTYPESIMPL_EXPORT Date
+class CSPCORE_EXPORT Date
 {
 public:
     Date() : Date( NONE() ) {}
@@ -316,7 +316,7 @@ inline std::ostream & operator <<( std::ostream &os, const Date & d )
     return os;
 }
 
-class CSPTYPESIMPL_EXPORT Time
+class CSPCORE_EXPORT Time
 {
 public:
     Time() : Time( -1 ) {} //NONE
@@ -446,7 +446,7 @@ inline std::ostream & operator <<( std::ostream &os, const Time & t )
 
 // Time is internally stored as an int64_t nanoseconds since 1970. 
 // All DateTime objects are stored as UTC and should be treated as such
-class CSPTYPESIMPL_EXPORT DateTime
+class CSPCORE_EXPORT DateTime
 {
 public:
     DateTime() : DateTime( DateTime::NONE() ) {}
@@ -597,7 +597,7 @@ inline std::ostream & operator <<( std::ostream &os, const DateTime & dt )
 //Helper class to extract day/month/year/etc info from raw timestamp
 //ie DateTimeEx dte( existingDt )
 //dte.day, etc etc
-class CSPTYPESIMPL_EXPORT DateTimeEx : public DateTime
+class CSPCORE_EXPORT DateTimeEx : public DateTime
 {
 public:
     DateTimeEx( const DateTime & dt );