mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve Linker Warning LNK4104

Browse Source 
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>
This commit is contained in:
Mike Kaganski
2015-12-05 20:37:41 +10:00
committed by Matúš Kukan
parent 8050b97aca
commit 3149c04bb7
11 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
embedserv/Library_inprocserv.mk
View File

@@ -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

5
embedserv/source/inprocserv/inprocserv.def Normal file
View File

@@ -0,0 +1,5 @@
EXPORTS
DllCanUnloadNow PRIVATE
DllGetClassObject PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE

5
shell/Library_ooofilt.mk
View File

@@ -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 \
))

5
shell/Library_ooofilt_x64.mk
View File

@@ -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 \
))

3
shell/Library_propertyhdl.mk
View File

@@ -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 \
))

3
shell/Library_propertyhdl_x64.mk
View File

@@ -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 \
))

5
shell/Library_shlxthdl.mk
View File

@@ -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 \
))

5
shell/Library_shlxthdl_x64.mk
View File

@@ -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 \
))

5
shell/source/win32/shlxthandler/ooofilt/ooofilt.def Normal file
View File

@@ -0,0 +1,5 @@
EXPORTS
DllCanUnloadNow PRIVATE
DllGetClassObject PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE

3
shell/source/win32/shlxthandler/prophdl/propertyhdl.def Normal file
View File

@@ -0,0 +1,3 @@
EXPORTS
DllCanUnloadNow PRIVATE
DllGetClassObject PRIVATE

5
shell/source/win32/shlxthandler/shlxthdl.def Normal file
View File

@@ -0,0 +1,5 @@
EXPORTS
DllCanUnloadNow PRIVATE
DllGetClassObject PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE