diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2015-12-05 20:37:41 +1000 |
|---|---|---|
| committer | Matúš Kukan <matus@libreoffice.org> | 2015-12-08 19:34:59 +0000 |
| commit | 3149c04bb7fd79ae1b206a257b8195a209fa34c7 (patch) | |
| tree | 6b9fd226c14f2734c960d687660e203230919ad2 /shell | |
| parent | 8050b97aca3efbba6df31c53a64ead9c81d9d708 (diff) | |
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@libreoffice.org>
Reviewed-by: Matúš Kukan <matus@libreoffice.org>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_ooofilt.mk | 5 | ||||
| -rw-r--r-- | shell/Library_ooofilt_x64.mk | 5 | ||||
| -rw-r--r-- | shell/Library_propertyhdl.mk | 3 | ||||
| -rw-r--r-- | shell/Library_propertyhdl_x64.mk | 3 | ||||
| -rw-r--r-- | shell/Library_shlxthdl.mk | 5 | ||||
| -rw-r--r-- | shell/Library_shlxthdl_x64.mk | 5 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/ooofilt/ooofilt.def | 5 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/prophdl/propertyhdl.def | 3 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/shlxthdl.def | 5 |
9 files changed, 19 insertions, 20 deletions
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index d7897ca7c081..dafee1032bb6 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 26f85cefc6b0..a9f4cd5b1be0 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 31f433aaaed5..148b2eab94fc 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 cd189287f277..9599b3d30310 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 30e8f586f7cc..be4b67e949ee 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 a539b729909b..fb49fa0d0363 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 000000000000..d731a151f0db --- /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 000000000000..22b670b3c1bc --- /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 000000000000..d731a151f0db --- /dev/null +++ b/shell/source/win32/shlxthandler/shlxthdl.def @@ -0,0 +1,5 @@ +EXPORTS
+ DllCanUnloadNow PRIVATE
+ DllGetClassObject PRIVATE
+ DllRegisterServer PRIVATE
+ DllUnregisterServer PRIVATE
|