windows: fix undefined reference problems

- created separate subdirectories for libbareos and libbareoscfg - added an extra define for DLL_IMP_EXP specifically for ConfigurationParser - created manually .def file and auto build of import library for libbareoscfg
bareos · Sep 20, 2018 · 1867d11 · 1867d11
1 parent d12f266
commit 1867d11
Show file tree

Hide file tree

Showing 89 changed files with 44 additions and 90 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -128,6 +128,11 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
       ${CMAKE_SOURCE_DIR}/src/win32/include
       ${CMAKE_SOURCE_DIR}/src/win32/compat/include
       )
+
+   #used for import libraries:
+   set(WINDOWS_IMPORT_LIB_DIRECTORY ${PROJECT_BINARY_DIR}/src/lib/bareos) 
+   link_directories(${WINDOWS_IMPORT_LIB_DIRECTORY})
+
    set(HAVE_WIN32 1)
 
    set(WINDOWS_LIBRARIES ws2_32)

diff --git a/core/src/include/baconfig.h b/core/src/include/baconfig.h
@@ -109,11 +109,23 @@ void InitWinAPIWrapper();
 #define DLL_IMP_EXP _declspec(dllexport)
 #define CATS_IMP_EXP _declspec(dllexport)
 #define SD_IMP_EXP _declspec(dllexport)
+#define BAREOSCFG_DLL_IMP_EXP _declspec(dllimport)
+#elif defined(BUILDING_BAREOS_DLL)
+#define DLL_IMP_EXP _declspec(dllexport)
+#define CATS_IMP_EXP _declspec(dllexport)
+#define SD_IMP_EXP _declspec(dllexport)
+#define BAREOSCFG_DLL_IMP_EXP _declspec(dllimport)
+#elif defined(BUILDING_BAREOSCFG_DLL)
+#define DLL_IMP_EXP _declspec(dllexport)
+#define CATS_IMP_EXP _declspec(dllexport)
+#define SD_IMP_EXP _declspec(dllexport)
+#define BAREOSCFG_DLL_IMP_EXP _declspec(dllexport)
 #elif defined(USING_DLL)
 #define DLL_IMP_EXP _declspec(dllimport)
 #define CATS_IMP_EXP _declspec(dllimport)
 #define SD_IMP_EXP _declspec(dllimport)
 #else
+#define BAREOSCFG_DLL_IMP_EXP
 #define DLL_IMP_EXP
 #define CATS_IMP_EXP
 #define SD_IMP_EXP
@@ -123,6 +135,7 @@ void InitWinAPIWrapper();
 
 #define ClearThreadId(x) x = 0
 
+#define BAREOSCFG_DLL_IMP_EXP
 #define DLL_IMP_EXP
 #define CATS_IMP_EXP
 #define SD_IMP_EXP

diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
@@ -17,99 +17,24 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-include_directories(
-   ${OPENSSL_INCLUDE_DIRS}
-   ${PTHREAD_INCLUDE_DIRS}
-   ${FASTLZ_INCLUDE_DIRS}
-   ${ZLIB_INCLUDE_DIRS}
-   ${ACL_INCLUDE_DIRS}
-   ${LZO2_INCLUDE_DIRS}
-   ${CAP_INCLUDE_DIRS}
-   ${WRAP_INCLUDE_DIRS}
-   )
-
 set(INCLUDE_FILES ../include/baconfig.h ../include/bareos.h
-		../include/bc_types.h ../include/config.h
-		../include/jcr.h ../include/version.h
-		address_conf.h alist.h attr.h base64.h berrno.h
-		bits.h bpipe.h breg.h bregex.h bsock.h
-		bsock_tcp.h btime.h btimers.h cbuf.h
-		crypto.h crypto_cache.h devlock.h dlist.h fnmatch.h
-		guid_to_name.h htable.h ini.h lex.h lib.h lockmgr.h
-		md5.h mem_pool.h message.h mntent_cache.h ordered_cbuf.h parse_conf.h
-		plugins.h qualified_resource_name_type_converter.h queue.h rblist.h
-    runscript.h rwlock.h scsi_crypto.h scsi_lli.h scsi_tapealert.h sellist.h
-		serial.h sha1.h smartall.h status.h tls.h tls_conf.h tree.h var.h
-		watchdog.h workq.h)
-
-set (BAREOS_SRCS  address_conf.cc alist.cc attr.cc attribs.cc base64.cc
-   berrno.cc bget_msg.cc binflate.cc bnet_server_tcp.cc bnet.cc  bpipe.cc
-   breg.cc bregex.cc bsnprintf.cc bsock.cc bsock_tcp.cc
-   bsys.cc btime.cc btimers.cc  cbuf.cc compression.cc
-   connection_pool.cc cram-md5.cc crypto.cc  crypto_cache.cc crypto_gnutls.cc
-   crypto_none.cc crypto_nss.cc  crypto_openssl.cc crypto_wrap.cc daemon.cc
-   devlock.cc dlist.cc  edit.cc fnmatch.cc guid_to_name.cc hmac.cc htable.cc
-   jcr.cc json.cc  lockmgr.cc md5.cc mem_pool.cc message.cc mntent_cache.cc
-   output_formatter.cc ordered_cbuf.cc passphrase.cc path_list.cc plugins.cc
-   bpoll.cc  priv.cc
-   queue.cc rblist.cc runscript.cc rwlock.cc scan.cc scsi_crypto.cc  scsi_lli.cc
-   sellist.cc serial.cc sha1.cc signal.cc  smartall.cc tls.cc
-   tls_gnutls.cc tls_conf_base.cc tls_conf_psk.cc tls_conf_cert.cc tls_openssl.cc tls_openssl_crl.cc
-   tls_openssl_private.cc tree.cc util.cc var.cc
-   watchdog.cc workq.cc)
-
-IF(HAVE_WIN32)
-   LIST(APPEND BAREOS_SRCS
-      ../win32/compat/compat.cc
-      ../win32/compat/glob.cc
-      ../win32/compat/print.cc
-      ../win32/compat/winapi.cc
-      )
-ELSE()
-   LIST(APPEND BAREOS_SRCS
-     scsi_tapealert.cc)
-ENDIF()
-
-add_library(bareos SHARED ${BAREOS_SRCS})
-
-target_link_libraries(bareos
-   ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${FASTLZ_LIBRARIES} ${ZLIB_LIBRARIES}
-   ${ACL_LIBRARIES} ${LZO2_LIBRARIES} ${CAP_LIBRARIES} ${WRAP_LIBRARIES} ${CAM_LIBRARIES}
-   ${WINDOWS_LIBRARIES} ${JANSSON_LIBRARIES})
-
-set (BAREOSCFG_SRCS ini.cc lex.cc parse_bsr.cc )
-
-
-
-set (BAREOS_STATIC_SRCS parse_conf.cc res.cc qualified_resource_name_type_converter.cc)
-
-IF(HAVE_WIN32)
-   add_library(bareosstatic STATIC ${BAREOS_STATIC_SRCS})
-   target_link_libraries(bareosstatic bareoscfg)
-ELSE()
-   LIST(APPEND BAREOSCFG_SRCS ${BAREOS_STATIC_SRCS})
-ENDIF()
-
-add_library(bareoscfg SHARED ${BAREOSCFG_SRCS})
-target_link_libraries(bareoscfg bareos ${JANSSON_LIBRARIES})
-
-INSTALL(TARGETS bareos DESTINATION ${libdir})
-INSTALL(TARGETS bareoscfg DESTINATION ${libdir})
-
-set_target_properties(bareoscfg PROPERTIES VERSION "${VERSION}"
-                                          SOVERSION "${SOVERSION}"
-                                          )
-
-set_target_properties(bareos PROPERTIES VERSION "${VERSION}"
-                                          SOVERSION "${SOVERSION}"
-                                          )
-IF(HAVE_WIN32)
-   set_target_properties(bareoscfg PROPERTIES DEFINE_SYMBOL "BUILDING_DLL")
-   set_target_properties(bareos PROPERTIES DEFINE_SYMBOL "BUILDING_DLL")
-ENDIF()
+   ../include/bc_types.h ../include/config.h
+   ../include/jcr.h ../include/version.h
+   address_conf.h alist.h attr.h base64.h berrno.h
+   bits.h bpipe.h breg.h bregex.h bsock.h
+   bsock_tcp.h btime.h btimers.h cbuf.h
+   crypto.h crypto_cache.h devlock.h dlist.h fnmatch.h
+   guid_to_name.h htable.h ini.h lex.h lib.h lockmgr.h
+   md5.h mem_pool.h message.h mntent_cache.h ordered_cbuf.h parse_conf.h
+   plugins.h qualified_resource_name_type_converter.h queue.h rblist.h
+   runscript.h rwlock.h scsi_crypto.h scsi_lli.h scsi_tapealert.h sellist.h
+   serial.h sha1.h smartall.h status.h tls.h tls_conf.h tree.h var.h
+   watchdog.h workq.h)
 
 INSTALL(FILES ${INCLUDE_FILES} DESTINATION ${includedir})
 
+add_subdirectory(bareoscfg)
+add_subdirectory(bareos)
 
 IF(NOT HAVE_WIN32 AND GTEST_FOUND)
    add_subdirectory(unittests)

diff --git a/core/src/lib/address_conf.cc → core/src/lib/bareos/address_conf.cc b/core/src/lib/address_conf.cc → core/src/lib/bareos/address_conf.cc
diff --git a/core/src/lib/alist.cc → core/src/lib/bareos/alist.cc b/core/src/lib/alist.cc → core/src/lib/bareos/alist.cc
diff --git a/core/src/lib/attr.cc → core/src/lib/bareos/attr.cc b/core/src/lib/attr.cc → core/src/lib/bareos/attr.cc
diff --git a/core/src/lib/attribs.cc → core/src/lib/bareos/attribs.cc b/core/src/lib/attribs.cc → core/src/lib/bareos/attribs.cc
diff --git a/core/src/lib/base64.cc → core/src/lib/bareos/base64.cc b/core/src/lib/base64.cc → core/src/lib/bareos/base64.cc
diff --git a/core/src/lib/berrno.cc → core/src/lib/bareos/berrno.cc b/core/src/lib/berrno.cc → core/src/lib/bareos/berrno.cc
diff --git a/core/src/lib/bget_msg.cc → core/src/lib/bareos/bget_msg.cc b/core/src/lib/bget_msg.cc → core/src/lib/bareos/bget_msg.cc
diff --git a/core/src/lib/binflate.cc → core/src/lib/bareos/binflate.cc b/core/src/lib/binflate.cc → core/src/lib/bareos/binflate.cc
diff --git a/core/src/lib/bnet.cc → core/src/lib/bareos/bnet.cc b/core/src/lib/bnet.cc → core/src/lib/bareos/bnet.cc
diff --git a/core/src/lib/bnet_server_tcp.cc → core/src/lib/bareos/bnet_server_tcp.cc b/core/src/lib/bnet_server_tcp.cc → core/src/lib/bareos/bnet_server_tcp.cc
diff --git a/core/src/lib/bpipe.cc → core/src/lib/bareos/bpipe.cc b/core/src/lib/bpipe.cc → core/src/lib/bareos/bpipe.cc
diff --git a/core/src/lib/bpoll.cc → core/src/lib/bareos/bpoll.cc b/core/src/lib/bpoll.cc → core/src/lib/bareos/bpoll.cc
diff --git a/core/src/lib/breg.cc → core/src/lib/bareos/breg.cc b/core/src/lib/breg.cc → core/src/lib/bareos/breg.cc
diff --git a/core/src/lib/bregex.cc → core/src/lib/bareos/bregex.cc b/core/src/lib/bregex.cc → core/src/lib/bareos/bregex.cc
diff --git a/core/src/lib/bsnprintf.cc → core/src/lib/bareos/bsnprintf.cc b/core/src/lib/bsnprintf.cc → core/src/lib/bareos/bsnprintf.cc
diff --git a/core/src/lib/bsock.cc → core/src/lib/bareos/bsock.cc b/core/src/lib/bsock.cc → core/src/lib/bareos/bsock.cc
diff --git a/core/src/lib/bsock_tcp.cc → core/src/lib/bareos/bsock_tcp.cc b/core/src/lib/bsock_tcp.cc → core/src/lib/bareos/bsock_tcp.cc
diff --git a/core/src/lib/bsys.cc → core/src/lib/bareos/bsys.cc b/core/src/lib/bsys.cc → core/src/lib/bareos/bsys.cc
diff --git a/core/src/lib/btime.cc → core/src/lib/bareos/btime.cc b/core/src/lib/btime.cc → core/src/lib/bareos/btime.cc
diff --git a/core/src/lib/btimers.cc → core/src/lib/bareos/btimers.cc b/core/src/lib/btimers.cc → core/src/lib/bareos/btimers.cc
diff --git a/core/src/lib/cbuf.cc → core/src/lib/bareos/cbuf.cc b/core/src/lib/cbuf.cc → core/src/lib/bareos/cbuf.cc
diff --git a/core/src/lib/compression.cc → core/src/lib/bareos/compression.cc b/core/src/lib/compression.cc → core/src/lib/bareos/compression.cc
diff --git a/core/src/lib/connection_pool.cc → core/src/lib/bareos/connection_pool.cc b/core/src/lib/connection_pool.cc → core/src/lib/bareos/connection_pool.cc
diff --git a/core/src/lib/cram-md5.cc → core/src/lib/bareos/cram-md5.cc b/core/src/lib/cram-md5.cc → core/src/lib/bareos/cram-md5.cc
diff --git a/core/src/lib/crypto.cc → core/src/lib/bareos/crypto.cc b/core/src/lib/crypto.cc → core/src/lib/bareos/crypto.cc
diff --git a/core/src/lib/crypto_cache.cc → core/src/lib/bareos/crypto_cache.cc b/core/src/lib/crypto_cache.cc → core/src/lib/bareos/crypto_cache.cc
diff --git a/core/src/lib/crypto_gnutls.cc → core/src/lib/bareos/crypto_gnutls.cc b/core/src/lib/crypto_gnutls.cc → core/src/lib/bareos/crypto_gnutls.cc
diff --git a/core/src/lib/crypto_none.cc → core/src/lib/bareos/crypto_none.cc b/core/src/lib/crypto_none.cc → core/src/lib/bareos/crypto_none.cc
diff --git a/core/src/lib/crypto_nss.cc → core/src/lib/bareos/crypto_nss.cc b/core/src/lib/crypto_nss.cc → core/src/lib/bareos/crypto_nss.cc
diff --git a/core/src/lib/crypto_openssl.cc → core/src/lib/bareos/crypto_openssl.cc b/core/src/lib/crypto_openssl.cc → core/src/lib/bareos/crypto_openssl.cc
diff --git a/core/src/lib/crypto_wrap.cc → core/src/lib/bareos/crypto_wrap.cc b/core/src/lib/crypto_wrap.cc → core/src/lib/bareos/crypto_wrap.cc
diff --git a/core/src/lib/daemon.cc → core/src/lib/bareos/daemon.cc b/core/src/lib/daemon.cc → core/src/lib/bareos/daemon.cc
diff --git a/core/src/lib/devlock.cc → core/src/lib/bareos/devlock.cc b/core/src/lib/devlock.cc → core/src/lib/bareos/devlock.cc
diff --git a/core/src/lib/dlist.cc → core/src/lib/bareos/dlist.cc b/core/src/lib/dlist.cc → core/src/lib/bareos/dlist.cc
diff --git a/core/src/lib/edit.cc → core/src/lib/bareos/edit.cc b/core/src/lib/edit.cc → core/src/lib/bareos/edit.cc
diff --git a/core/src/lib/fnmatch.cc → core/src/lib/bareos/fnmatch.cc b/core/src/lib/fnmatch.cc → core/src/lib/bareos/fnmatch.cc
diff --git a/core/src/lib/guid_to_name.cc → core/src/lib/bareos/guid_to_name.cc b/core/src/lib/guid_to_name.cc → core/src/lib/bareos/guid_to_name.cc
diff --git a/core/src/lib/hmac.cc → core/src/lib/bareos/hmac.cc b/core/src/lib/hmac.cc → core/src/lib/bareos/hmac.cc
diff --git a/core/src/lib/htable.cc → core/src/lib/bareos/htable.cc b/core/src/lib/htable.cc → core/src/lib/bareos/htable.cc
diff --git a/core/src/lib/jcr.cc → core/src/lib/bareos/jcr.cc b/core/src/lib/jcr.cc → core/src/lib/bareos/jcr.cc
diff --git a/core/src/lib/json.cc → core/src/lib/bareos/json.cc b/core/src/lib/json.cc → core/src/lib/bareos/json.cc
diff --git a/core/src/lib/lockmgr.cc → core/src/lib/bareos/lockmgr.cc b/core/src/lib/lockmgr.cc → core/src/lib/bareos/lockmgr.cc
diff --git a/core/src/lib/md5.cc → core/src/lib/bareos/md5.cc b/core/src/lib/md5.cc → core/src/lib/bareos/md5.cc
diff --git a/core/src/lib/mem_pool.cc → core/src/lib/bareos/mem_pool.cc b/core/src/lib/mem_pool.cc → core/src/lib/bareos/mem_pool.cc
diff --git a/core/src/lib/message.cc → core/src/lib/bareos/message.cc b/core/src/lib/message.cc → core/src/lib/bareos/message.cc
diff --git a/core/src/lib/mntent_cache.cc → core/src/lib/bareos/mntent_cache.cc b/core/src/lib/mntent_cache.cc → core/src/lib/bareos/mntent_cache.cc
diff --git a/core/src/lib/ordered_cbuf.cc → core/src/lib/bareos/ordered_cbuf.cc b/core/src/lib/ordered_cbuf.cc → core/src/lib/bareos/ordered_cbuf.cc
diff --git a/core/src/lib/output_formatter.cc → core/src/lib/bareos/output_formatter.cc b/core/src/lib/output_formatter.cc → core/src/lib/bareos/output_formatter.cc
diff --git a/core/src/lib/passphrase.cc → core/src/lib/bareos/passphrase.cc b/core/src/lib/passphrase.cc → core/src/lib/bareos/passphrase.cc
diff --git a/core/src/lib/path_list.cc → core/src/lib/bareos/path_list.cc b/core/src/lib/path_list.cc → core/src/lib/bareos/path_list.cc
diff --git a/core/src/lib/plugins.cc → core/src/lib/bareos/plugins.cc b/core/src/lib/plugins.cc → core/src/lib/bareos/plugins.cc
diff --git a/core/src/lib/priv.cc → core/src/lib/bareos/priv.cc b/core/src/lib/priv.cc → core/src/lib/bareos/priv.cc
diff --git a/core/src/lib/queue.cc → core/src/lib/bareos/queue.cc b/core/src/lib/queue.cc → core/src/lib/bareos/queue.cc
diff --git a/core/src/lib/rblist.cc → core/src/lib/bareos/rblist.cc b/core/src/lib/rblist.cc → core/src/lib/bareos/rblist.cc
diff --git a/core/src/lib/runscript.cc → core/src/lib/bareos/runscript.cc b/core/src/lib/runscript.cc → core/src/lib/bareos/runscript.cc
diff --git a/core/src/lib/rwlock.cc → core/src/lib/bareos/rwlock.cc b/core/src/lib/rwlock.cc → core/src/lib/bareos/rwlock.cc
diff --git a/core/src/lib/scan.cc → core/src/lib/bareos/scan.cc b/core/src/lib/scan.cc → core/src/lib/bareos/scan.cc
diff --git a/core/src/lib/scsi_crypto.cc → core/src/lib/bareos/scsi_crypto.cc b/core/src/lib/scsi_crypto.cc → core/src/lib/bareos/scsi_crypto.cc
diff --git a/core/src/lib/scsi_lli.cc → core/src/lib/bareos/scsi_lli.cc b/core/src/lib/scsi_lli.cc → core/src/lib/bareos/scsi_lli.cc
diff --git a/core/src/lib/scsi_tapealert.cc → core/src/lib/bareos/scsi_tapealert.cc b/core/src/lib/scsi_tapealert.cc → core/src/lib/bareos/scsi_tapealert.cc
diff --git a/core/src/lib/sellist.cc → core/src/lib/bareos/sellist.cc b/core/src/lib/sellist.cc → core/src/lib/bareos/sellist.cc
diff --git a/core/src/lib/serial.cc → core/src/lib/bareos/serial.cc b/core/src/lib/serial.cc → core/src/lib/bareos/serial.cc
diff --git a/core/src/lib/sha1.cc → core/src/lib/bareos/sha1.cc b/core/src/lib/sha1.cc → core/src/lib/bareos/sha1.cc
diff --git a/core/src/lib/signal.cc → core/src/lib/bareos/signal.cc b/core/src/lib/signal.cc → core/src/lib/bareos/signal.cc
diff --git a/core/src/lib/smartall.cc → core/src/lib/bareos/smartall.cc b/core/src/lib/smartall.cc → core/src/lib/bareos/smartall.cc
diff --git a/core/src/lib/tls.cc → core/src/lib/bareos/tls.cc b/core/src/lib/tls.cc → core/src/lib/bareos/tls.cc
diff --git a/core/src/lib/tls_conf_base.cc → core/src/lib/bareos/tls_conf_base.cc b/core/src/lib/tls_conf_base.cc → core/src/lib/bareos/tls_conf_base.cc
diff --git a/core/src/lib/tls_conf_cert.cc → core/src/lib/bareos/tls_conf_cert.cc b/core/src/lib/tls_conf_cert.cc → core/src/lib/bareos/tls_conf_cert.cc
diff --git a/core/src/lib/tls_conf_psk.cc → core/src/lib/bareos/tls_conf_psk.cc b/core/src/lib/tls_conf_psk.cc → core/src/lib/bareos/tls_conf_psk.cc
diff --git a/core/src/lib/tls_gnutls.cc → core/src/lib/bareos/tls_gnutls.cc b/core/src/lib/tls_gnutls.cc → core/src/lib/bareos/tls_gnutls.cc
diff --git a/core/src/lib/tls_openssl.cc → core/src/lib/bareos/tls_openssl.cc b/core/src/lib/tls_openssl.cc → core/src/lib/bareos/tls_openssl.cc
diff --git a/core/src/lib/tls_openssl_crl.cc → core/src/lib/bareos/tls_openssl_crl.cc b/core/src/lib/tls_openssl_crl.cc → core/src/lib/bareos/tls_openssl_crl.cc
diff --git a/core/src/lib/tls_openssl_private.cc → core/src/lib/bareos/tls_openssl_private.cc b/core/src/lib/tls_openssl_private.cc → core/src/lib/bareos/tls_openssl_private.cc
diff --git a/core/src/lib/tree.cc → core/src/lib/bareos/tree.cc b/core/src/lib/tree.cc → core/src/lib/bareos/tree.cc
diff --git a/core/src/lib/util.cc → core/src/lib/bareos/util.cc b/core/src/lib/util.cc → core/src/lib/bareos/util.cc
diff --git a/core/src/lib/var.cc → core/src/lib/bareos/var.cc b/core/src/lib/var.cc → core/src/lib/bareos/var.cc
diff --git a/core/src/lib/watchdog.cc → core/src/lib/bareos/watchdog.cc b/core/src/lib/watchdog.cc → core/src/lib/bareos/watchdog.cc
diff --git a/core/src/lib/workq.cc → core/src/lib/bareos/workq.cc b/core/src/lib/workq.cc → core/src/lib/bareos/workq.cc
diff --git a/core/src/lib/ini.cc → core/src/lib/bareoscfg/ini.cc b/core/src/lib/ini.cc → core/src/lib/bareoscfg/ini.cc
diff --git a/core/src/lib/lex.cc → core/src/lib/bareoscfg/lex.cc b/core/src/lib/lex.cc → core/src/lib/bareoscfg/lex.cc
diff --git a/core/src/lib/parse_bsr.cc → core/src/lib/bareoscfg/parse_bsr.cc b/core/src/lib/parse_bsr.cc → core/src/lib/bareoscfg/parse_bsr.cc
diff --git a/core/src/lib/parse_conf.cc → core/src/lib/bareoscfg/parse_conf.cc b/core/src/lib/parse_conf.cc → core/src/lib/bareoscfg/parse_conf.cc
diff --git a/...qualified_resource_name_type_converter.cc → ...qualified_resource_name_type_converter.cc b/...qualified_resource_name_type_converter.cc → ...qualified_resource_name_type_converter.cc
diff --git a/core/src/lib/res.cc → core/src/lib/bareoscfg/res.cc b/core/src/lib/res.cc → core/src/lib/bareoscfg/res.cc
diff --git a/core/src/lib/parse_conf.h b/core/src/lib/parse_conf.h
@@ -475,7 +475,7 @@ class QualifiedResourceNameTypeConverter;
 /*
  * New C++ configuration routines
  */
-class DLL_IMP_EXP ConfigurationParser {
+class BAREOSCFG_DLL_IMP_EXP ConfigurationParser {
  public:
   std::string cf_;                    /* Config file parameter */
   LEX_ERROR_HANDLER *scan_error_;     /* Error handler if non-null */

diff --git a/core/src/win32/compat/include/compat.h b/core/src/win32/compat/include/compat.h
@@ -40,11 +40,22 @@
 #define DLL_IMP_EXP _declspec(dllexport)
 #define CATS_IMP_EXP _declspec(dllexport)
 #define SD_IMP_EXP _declspec(dllexport)
+#elif defined(BUILDING_BAREOS_DLL)
+#define DLL_IMP_EXP _declspec(dllexport)
+#define CATS_IMP_EXP _declspec(dllexport)
+#define SD_IMP_EXP _declspec(dllexport)
+#define BAREOSCFG_DLL_IMP_EXP _declspec(dllimport)
+#elif defined(BUILDING_BAREOSCFG_DLL)
+#define DLL_IMP_EXP _declspec(dllexport)
+#define CATS_IMP_EXP _declspec(dllexport)
+#define SD_IMP_EXP _declspec(dllexport)
+#define BAREOSCFG_DLL_IMP_EXP _declspec(dllexport)
 #elif defined(USING_DLL)
 #define DLL_IMP_EXP _declspec(dllimport)
 #define CATS_IMP_EXP _declspec(dllimport)
 #define SD_IMP_EXP _declspec(dllimport)
 #else
+#define BAREOSCFG_DLL_IMP_EXP
 #define DLL_IMP_EXP
 #define CATS_IMP_EXP
 #define SD_IMP_EXP