Added scl_memmgr to clutils library.

davyw · davyw · commit 010e02b7a6b1 · 2012-03-20T21:07:02.000+01:00
diff --git a/src/clutils/CMakeLists.txt b/src/clutils/CMakeLists.txt
@@ -23,15 +23,17 @@ SET(LIBSTEPUTILS_PRIVATE_HDRS
 )
 
 include_directories(
+    ${SCL_SOURCE_DIR}/src/base
     ${SCL_BINARY_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 if (MSVC OR BORLAND)
+add_definitions( -DSCL_BASE_DLL_IMPORTS )
 add_definitions( -DSCL_UTILS_DLL_EXPORTS )
 endif()
 
-SCL_ADDLIB(steputils "${LIBSTEPUTILS_SRCS}" "")
+SCL_ADDLIB(steputils "${LIBSTEPUTILS_SRCS}" "base")
 
 IF(MINGW)
     TARGET_LINK_LIBRARIES(steputils shlwapi.lib)
diff --git a/src/clutils/Str.cc b/src/clutils/Str.cc
@@ -11,6 +11,7 @@
 */
 
 #include <Str.h>
+#include <scl_memmgr.h>
 #ifndef STRING_DELIM
 #define STRING_DELIM '\''
 #endif
diff --git a/src/clutils/dirobj.cc b/src/clutils/dirobj.cc
@@ -57,6 +57,8 @@
 #include <shlwapi.h>
 #endif
 
+#include <scl_memmgr.h>
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Create a new DirObj object.
diff --git a/src/clutils/errordesc.cc b/src/clutils/errordesc.cc
@@ -14,6 +14,7 @@
 
 #include <errordesc.h>
 #include <Str.h>
+#include <scl_memmgr.h>
 
 DebugLevel ErrorDescriptor::_debug_level = DEBUG_OFF;
 ostream  * ErrorDescriptor::_out = 0;
diff --git a/src/clutils/gennode.cc b/src/clutils/gennode.cc
@@ -14,6 +14,7 @@
 
 #include <gennode.h>
 #include <gennodelist.h>
+#include <scl_memmgr.h>
 
 //////////////////////////////////////////////////////////////////////////////
 // class GenericNode inline functions that depend on other classes
diff --git a/src/clutils/gennodearray.cc b/src/clutils/gennodearray.cc
@@ -16,6 +16,7 @@
 #include <gennode.h>
 #include <gennodelist.h>
 #include <gennodearray.h>
+#include <scl_memmgr.h>
 
 #ifndef HAVE_MEMMOVE
 extern "C" {
diff --git a/src/clutils/gennodelist.cc b/src/clutils/gennodelist.cc
@@ -16,6 +16,7 @@
 #include <gennodelist.h>
 //#include <gennode.inline.h>
 #include <gennodearray.h>
+#include <scl_memmgr.h>
 
 // inserts after existNode
 void GenNodeList::InsertAfter( GenericNode * newNode,
diff --git a/src/clutils/scl_hash.cc b/src/clutils/scl_hash.cc
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <scl_memmgr.h>
 
 /*************/
 /* constants */
