diff options
| author | Andras Timar <atimar@suse.com> | 2012-05-29 16:47:03 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-05-29 16:48:55 +0200 |
| commit | 759d11c6c7c5174d04803f5710db62cba35dfde8 (patch) | |
| tree | f158ae59d7b1ff976add7d2010f1e38a266e0aab /shell | |
| parent | 6b915b210aeebeed104ab3e266c4ebc67c1c9d46 (diff) | |
trying to fix shell x64 build on Windows
Change-Id: Ibf5dffec5f5617d225f6f529566b524ebafc20c2
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/CustomTarget_x64.mk | 2 | ||||
| -rw-r--r-- | shell/Library_ooofilt_x64.mk | 2 | ||||
| -rw-r--r-- | shell/Library_propertyhdl_x64.mk | 4 | ||||
| -rw-r--r-- | shell/Library_shlxthdl_x64.mk | 2 | ||||
| -rw-r--r-- | shell/StaticLibrary_shlxthandler_common_x64.mk | 2 | ||||
| -rw-r--r-- | shell/StaticLibrary_xmlparser_x64.mk | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk index 75d1f608dd67..e1e5f681034a 100644 --- a/shell/CustomTarget_x64.mk +++ b/shell/CustomTarget_x64.mk @@ -57,7 +57,7 @@ SHELL_OOOFILT_FILES := \ win32/shlxthandler/ooofilt/propspec SHELL_PROPERTYHDL_FILES := \ - win32/shell/source/win32/shlxthandler/prophdl/propertyhdl + win32/shlxthandler/prophdl/propertyhdl SHELL_XMLPARSER_FILES := \ all/xml_parser diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 7620d520f837..47f058c416cb 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -84,7 +84,7 @@ $(eval $(call gb_Library_add_ldflags,ooofilt_x64,\ /EXPORT:DllUnregisterServer \ )) -$(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\ +$(eval $(call gb_Library_add_generated_exception_objects,ooofilt_x64,\ CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \ CustomTarget/shell/source/win32/shlxthandler/ooofilt/propspec \ )) diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index f613bd358c22..e774a50a2ac8 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -83,8 +83,8 @@ $(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\ /EXPORT:DllGetClassObject \ )) -$(eval $(call gb_Library_add_exception_objects,propertyhdl_x64,\ - shell/source/win32/shlxthandler/prophdl/propertyhdl \ +$(eval $(call gb_Library_add_generated_exception_objects,propertyhdl_x64,\ + CustomTarget/shell/source/win32/shlxthandler/prophdl/propertyhdl \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index f13d9dc8bd14..07327621a8c7 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -61,7 +61,7 @@ $(eval $(call gb_Library_use_libraries,shlxthdl_x64,\ gdi32 \ gdiplus \ kernel32 \ - mvvcprt \ + msvcprt \ msvcrt \ ole32 \ oleaut32 \ diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index b0d012456a66..98b58317c974 100644 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ b/shell/StaticLibrary_shlxthandler_common_x64.mk @@ -54,7 +54,7 @@ $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\ zlib \ )) -$(eval $(call gb_StaticLibrary_add_exception_objects,shlxthandler_common_x64,\ +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,shlxthandler_common_x64,\ CustomTarget/shell/source/win32/ooofilereader/autostyletag \ CustomTarget/shell/source/win32/ooofilereader/basereader \ CustomTarget/shell/source/win32/ooofilereader/contentreader \ diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk index 67c71c8d0373..126ef81b41d3 100644 --- a/shell/StaticLibrary_xmlparser_x64.mk +++ b/shell/StaticLibrary_xmlparser_x64.mk @@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,shell_xmlparser_x64)) $(eval $(call gb_StaticLibrary_set_x64,shell_xmlparser_x64,YES)) -$(eval $(call gb_StaticLibrary_add_exception_objects,shell_xmlparser_x64,\ +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,shell_xmlparser_x64,\ CustomTarget/shell/source/all/xml_parser \ )) |