[Libreoffice-commits] core.git: 2 commits - setup_native/Library_sellangmsi.mk setup_native/Module_setup_native.mk setup_native/source

[Peter Foley]

 setup_native/Library_sellangmsi.mk                           |    4 ++++
 setup_native/Module_setup_native.mk                          |    1 +
 setup_native/source/win32/customactions/sellang/sellang.cxx  |    2 +-
 setup_native/source/win32/customactions/sellang/sellang.def  |    4 ++++
 setup_native/source/win32/customactions/sellang/sorttree.cxx |    2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 684951f14679e2f73cd9ed8123c48fc9ab61515a
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Mon Feb 11 17:00:20 2013 -0500

    msvc needs instooofiltmsi too
    
    Change-Id: I343bedcfb588bfd3fbfea572e7ce24c77c0b8178

diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index 64ff432..43ab157 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -28,6 +28,7 @@ ifeq ($(OS),WNT)
 
 ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_targets,setup_native,\
+	Library_instooofiltmsi \
 	Library_jfregca \
 	Library_qslnkmsi \
 	Library_reg4allmsdoc \
commit 33b838a449d2bc320c3a509b870ecbe9d620ffe4
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Mon Feb 11 16:53:30 2013 -0500

    stdcall and declspec(dllexport) don't play nicely together
    
    Change-Id: I56da76771790cb6824ac3d01072d9143cb580741

diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk
index e32e7f6..41b6fae 100644
--- a/setup_native/Library_sellangmsi.mk
+++ b/setup_native/Library_sellangmsi.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_Library_add_defs,sellangmsi,\
 	-D_STLP_USE_STATIC_LIB \
 ))
 
+$(eval $(call gb_Library_add_ldflags,sellangmsi,\
+	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/sellang/sellang.def \
+))
+
 $(eval $(call gb_Library_add_exception_objects,sellangmsi,\
     setup_native/source/win32/customactions/sellang/sellang \
     setup_native/source/win32/customactions/sellang/sorttree \
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx
index 14576d1..b6f7ec5 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -232,7 +232,7 @@ void addMatchingDictionaries(
 
 }
 
-extern "C" __declspec(dllexport) UINT __stdcall SelectLanguage( MSIHANDLE handle )
+extern "C" UINT __stdcall SelectLanguage( MSIHANDLE handle )
 {
     char feature[100];
     MSIHANDLE database, view, record;
diff --git a/setup_native/source/win32/customactions/sellang/sellang.def b/setup_native/source/win32/customactions/sellang/sellang.def
new file mode 100755
index 0000000..8d3c4d4
--- /dev/null
+++ b/setup_native/source/win32/customactions/sellang/sellang.def
@@ -0,0 +1,4 @@
+LIBRARY		"sellangmsi.dll"
+EXPORTS
+			SelectLanguage
+			SortTree
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx b/setup_native/source/win32/customactions/sellang/sorttree.cxx
index e0f3169..9472a49 100644
--- a/setup_native/source/win32/customactions/sellang/sorttree.cxx
+++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx
@@ -18,7 +18,7 @@
 #pragma warning(pop)
 #endif
 
-extern "C" __declspec(dllexport) UINT __stdcall SortTree(MSIHANDLE)
+extern "C" UINT __stdcall SortTree(MSIHANDLE)
 {
     // Sort items (languages) in SelectionTree control, fdo#46355