windows: added separate .def file for 32bit

bareos · Sep 10, 2018 · a1edf9a · a1edf9a
1 parent 322672d
commit a1edf9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/core/src/lib/bareos/CMakeLists.txt b/core/src/lib/bareos/CMakeLists.txt
@@ -82,8 +82,8 @@ IF(HAVE_WIN32)
    ADD_CUSTOM_COMMAND(
       PRE_LINK
       TARGET bareos
-      DEPENDS libbareoscfg.def
-      COMMAND ${DLLTOOL} -d ${CMAKE_CURRENT_SOURCE_DIR}/libbareoscfg.def -l libbareoscfg_import_a 
+      DEPENDS libbareoscfg_${WINDOWS_BITS}.def
+      COMMAND ${DLLTOOL} -d ${CMAKE_CURRENT_SOURCE_DIR}/libbareoscfg_${WINDOWS_BITS}.def -l libbareoscfg_import_a 
       COMMAND echo ${CMAKE_CURRENT_BINARY_DIR}
       COMMAND cp libbareoscfg_import_a  ${WINDOWS_IMPORT_LIB_DIRECTORY}/libbareoscfg_import_a.a)
 

diff --git a/core/src/lib/bareos/libbareoscfg_32.def b/core/src/lib/bareos/libbareoscfg_32.def
@@ -0,0 +1,4 @@
+LIBRARY libbareoscfg.dll
+EXPORTS
+_imp___ZN19ConfigurationParser10GetNextResEiP20CommonResourceHeader
+_imp___ZN19ConfigurationParser37GetTlsPskByFullyQualifiedResourceNameEPS_PKcRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
diff --git a/core/src/lib/bareos/libbareoscfg.def → core/src/lib/bareos/libbareoscfg_64.def b/core/src/lib/bareos/libbareoscfg.def → core/src/lib/bareos/libbareoscfg_64.def