[Libreoffice-commits] core.git: embedserv/Library_inprocserv.mk embedserv/source shell/Library_ooofilt.mk shell/Library_ooofilt_x64.mk shell/Library_propertyhdl.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl.mk shell/Library_shlxthdl_x64.mk shell/source
Mike Kaganski
mike.kaganski at collabora.com
Tue Dec 8 11:35:22 PST 2015
embedserv/Library_inprocserv.mk | 6 +-----
embedserv/source/inprocserv/inprocserv.def | 5 +++++
shell/Library_ooofilt.mk | 5 +----
shell/Library_ooofilt_x64.mk | 5 +----
shell/Library_propertyhdl.mk | 3 +--
shell/Library_propertyhdl_x64.mk | 3 +--
shell/Library_shlxthdl.mk | 5 +----
shell/Library_shlxthdl_x64.mk | 5 +----
shell/source/win32/shlxthandler/ooofilt/ooofilt.def | 5 +++++
shell/source/win32/shlxthandler/prophdl/propertyhdl.def | 3 +++
shell/source/win32/shlxthandler/shlxthdl.def | 5 +++++
11 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 3149c04bb7fd79ae1b206a257b8195a209fa34c7
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Sat Dec 5 20:37:41 2015 +1000
Resolve Linker Warning LNK4104
See https://msdn.microsoft.com/en-us/library/e821azx1.aspx
Some export symbols should be PRIVATE
Also, don't export DLLMain. It is internal function
used by CRT, and not intended to be exported.
Change-Id: I48139b985aa2ee499c2005d8b0d966a2cc6dcd0c
Reviewed-on: https://gerrit.libreoffice.org/20419
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Matúš Kukan <matus at libreoffice.org>
diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk
index 8a153f8..a000c9c 100644
--- a/embedserv/Library_inprocserv.mk
+++ b/embedserv/Library_inprocserv.mk
@@ -27,11 +27,7 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\
ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_ldflags,inprocserv,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllMain \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
+ /DEF:$(SRCDIR)/embedserv/source/inprocserv/inprocserv.def \
))
endif
diff --git a/embedserv/source/inprocserv/inprocserv.def b/embedserv/source/inprocserv/inprocserv.def
new file mode 100644
index 0000000..d731a15
--- /dev/null
+++ b/embedserv/source/inprocserv/inprocserv.def
@@ -0,0 +1,5 @@
+EXPORTS
+ DllCanUnloadNow PRIVATE
+ DllGetClassObject PRIVATE
+ DllRegisterServer PRIVATE
+ DllUnregisterServer PRIVATE
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index d7897ca..dafee10 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -50,10 +50,7 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt,\
))
$(eval $(call gb_Library_add_ldflags,ooofilt,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
+ /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/ooofilt/ooofilt.def \
/NODEFAULTLIB:libcmt.lib \
))
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 26f85ce..a9f4cd5 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -56,10 +56,7 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\
))
$(eval $(call gb_Library_add_ldflags,ooofilt_x64,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
+ /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/ooofilt/ooofilt.def \
/NODEFAULTLIB:libcmt.lib \
))
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 31f433a..148b2ea 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -48,8 +48,7 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl,\
))
$(eval $(call gb_Library_add_ldflags,propertyhdl,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
+ /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/prophdl/propertyhdl.def \
/NODEFAULTLIB:libcmt.lib \
))
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index cd18928..9599b3d 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -57,8 +57,7 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\
))
$(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
+ /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/prophdl/propertyhdl.def \
/NODEFAULTLIB:libcmt.lib \
))
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 30e8f58..be4b67e 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -48,10 +48,7 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl,\
$(eval $(call gb_Library_add_nativeres,shlxthdl,shlxthdl))
$(eval $(call gb_Library_add_ldflags,shlxthdl,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
+ /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/shlxthdl.def \
/NODEFAULTLIB:libcmt.lib \
))
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index a539b72..fb49fa0 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -58,10 +58,7 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\
$(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl))
$(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
+ /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/shlxthdl.def \
/NODEFAULTLIB:libcmt.lib \
))
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.def b/shell/source/win32/shlxthandler/ooofilt/ooofilt.def
new file mode 100644
index 0000000..d731a15
--- /dev/null
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.def
@@ -0,0 +1,5 @@
+EXPORTS
+ DllCanUnloadNow PRIVATE
+ DllGetClassObject PRIVATE
+ DllRegisterServer PRIVATE
+ DllUnregisterServer PRIVATE
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.def b/shell/source/win32/shlxthandler/prophdl/propertyhdl.def
new file mode 100644
index 0000000..22b670b
--- /dev/null
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.def
@@ -0,0 +1,3 @@
+EXPORTS
+ DllCanUnloadNow PRIVATE
+ DllGetClassObject PRIVATE
diff --git a/shell/source/win32/shlxthandler/shlxthdl.def b/shell/source/win32/shlxthandler/shlxthdl.def
new file mode 100644
index 0000000..d731a15
--- /dev/null
+++ b/shell/source/win32/shlxthandler/shlxthdl.def
@@ -0,0 +1,5 @@
+EXPORTS
+ DllCanUnloadNow PRIVATE
+ DllGetClassObject PRIVATE
+ DllRegisterServer PRIVATE
+ DllUnregisterServer PRIVATE
More information about the Libreoffice-commits
mailing list