diff options
| author | Tobias Krause <tkr@openoffice.org> | 2009-11-01 07:56:23 +0000 |
|---|---|---|
| committer | Tobias Krause <tkr@openoffice.org> | 2009-11-01 07:56:23 +0000 |
| commit | c7600cb7fa4d23050d452cd4fa1dcd84c187c79b (patch) | |
| tree | 3e57e849677710085afe9d8bbb328453d708f14c /shell | |
| parent | 99bae96504d2a7c2db5ab14057716039b6f7a312 (diff) | |
#105892# deliver new x64 libs to solver and made the client name of the ooofiltproxy depends to x86/x64 builds
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/prj/d.lst | 3 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/shell/prj/d.lst b/shell/prj/d.lst index 98d4a6215f..d623a55c2d 100644 --- a/shell/prj/d.lst +++ b/shell/prj/d.lst @@ -4,6 +4,9 @@ ..\%__SRC%\lib\*.uno.so %_DEST%\lib%_EXT%\*.uno.so ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe +..\%__SRC%\bin\x64\shlxthdl.dll %_DEST%\bin%_EXT%\shlxthdl_x64.dll +..\%__SRC%\bin\x64\ooofiltproxy.dll %_DEST%\bin%_EXT%\ooofiltproxy_x64.dll +..\%__SRC%\bin\x64\ooofilt.dll %_DEST%\bin%_EXT%\ooofilt_x64.dll ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a diff --git a/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx b/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx index b3bbe22964..4836eb34bb 100644 --- a/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx @@ -42,6 +42,7 @@ #ifdef __MINGW32__ #include <basetyps.h> #endif +#include "internal/config.hxx" /* @@ -87,8 +88,9 @@ void Init() { TCHAR buff[MAX_PATH]; GetModuleFileName(hThisLibrary, buff, (sizeof(buff)/sizeof(TCHAR))); - PathTruncateFileName(buff); - lstrcat(buff, TEXT("ooofilt.dll")); + PathTruncateFileName(buff); + + lstrcat(buff, MODULE_NAME_FILTER); hOoofilt = LoadLibraryEx(buff, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); |