diff options
| author | David Tardon <dtardon@redhat.com> | 2012-05-28 08:33:54 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:36:09 +0200 |
| commit | db416d1355048c36482fbd546696606fbb8e2768 (patch) | |
| tree | db2c353aa9f009ddcfb18e42f38bb4cdc982f3ef /shell | |
| parent | 802e83f972bd28903c6f214a862262d5f9a2843e (diff) | |
export COM functions
Change-Id: I5ab936c90b596716f92f04d0db46a77a656a758b
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_ooofilt.mk | 7 | ||||
| -rw-r--r-- | shell/Library_ooofilt_x64.mk | 9 | ||||
| -rw-r--r-- | shell/Library_shlxthdl.mk | 9 | ||||
| -rw-r--r-- | shell/Library_shlxthdl_x64.mk | 9 | ||||
| -rwxr-xr-x | shell/source/win32/shlxthandler/exports.dxp | 4 | ||||
| -rwxr-xr-x | shell/source/win32/shlxthandler/ooofilt/exports.dxp | 4 |
6 files changed, 34 insertions, 8 deletions
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index 0abdd9ba2237..30dd6159c3ae 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -75,6 +75,13 @@ $(eval $(call gb_Library_use_libraries,ooofilt,\ )) endif +$(eval $(call gb_Library_add_ldflags,ooofilt,\ + /EXPORT:DllCanUnloadNow \ + /EXPORT:DllGetClassObject \ + /EXPORT:DllRegisterServer \ + /EXPORT:DllUnregisterServer \ +)) + endif $(eval $(call gb_Library_use_static_libraries,ooofilt,\ diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 270abfdf9744..0e68d6232258 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -77,6 +77,15 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\ shlxthandler_common_x64 \ )) +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_ldflags,ooofilt_x64,\ + /EXPORT:DllCanUnloadNow \ + /EXPORT:DllGetClassObject \ + /EXPORT:DllRegisterServer \ + /EXPORT:DllUnregisterServer \ +)) +endif + $(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\ CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \ CustomTarget/shell/source/win32/shlxthandler/ooofilt/propspec \ diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index 3464a66f451c..199cc8d771e3 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk @@ -73,6 +73,15 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl,\ $(eval $(call gb_Library_add_nativeres,shlxthdl,shlxthdl)) +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_ldflags,shlxthdl,\ + /EXPORT:DllCanUnloadNow \ + /EXPORT:DllGetClassObject \ + /EXPORT:DllRegisterServer \ + /EXPORT:DllUnregisterServer \ +)) +endif + $(eval $(call gb_Library_add_exception_objects,shlxthdl,\ shell/source/win32/shlxthandler/classfactory \ shell/source/win32/shlxthandler/columninfo/columninfo \ diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index c6fd4006e8dc..54111626919c 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -79,6 +79,15 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\ $(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl)) +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\ + /EXPORT:DllCanUnloadNow \ + /EXPORT:DllGetClassObject \ + /EXPORT:DllRegisterServer \ + /EXPORT:DllUnregisterServer \ +)) +endif + $(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\ CustomTarget/shell/source/win32/shlxthandler/classfactory \ CustomTarget/shell/source/win32/shlxthandler/columninfo/columninfo \ diff --git a/shell/source/win32/shlxthandler/exports.dxp b/shell/source/win32/shlxthandler/exports.dxp deleted file mode 100755 index 953039ccc957..000000000000 --- a/shell/source/win32/shlxthandler/exports.dxp +++ /dev/null @@ -1,4 +0,0 @@ -DllRegisterServer PRIVATE -DllUnregisterServer PRIVATE -DllGetClassObject PRIVATE -DllCanUnloadNow PRIVATE
\ No newline at end of file diff --git a/shell/source/win32/shlxthandler/ooofilt/exports.dxp b/shell/source/win32/shlxthandler/ooofilt/exports.dxp deleted file mode 100755 index 953039ccc957..000000000000 --- a/shell/source/win32/shlxthandler/ooofilt/exports.dxp +++ /dev/null @@ -1,4 +0,0 @@ -DllRegisterServer PRIVATE -DllUnregisterServer PRIVATE -DllGetClassObject PRIVATE -DllCanUnloadNow PRIVATE
\ No newline at end of file |