Kaydet (Commit) 3149c04b authored tarafından Mike Kaganski's avatar Mike Kaganski Kaydeden (comit) Matúš Kukan

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/20419Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMatúš Kukan <matus@libreoffice.org>
üst 8050b97a
......@@ -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
......
EXPORTS
DllCanUnloadNow PRIVATE
DllGetClassObject PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
EXPORTS
DllCanUnloadNow PRIVATE
DllGetClassObject PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE
EXPORTS
DllCanUnloadNow PRIVATE
DllGetClassObject PRIVATE
EXPORTS
DllCanUnloadNow PRIVATE
DllGetClassObject PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment