diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-11-18 16:26:19 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2013-11-18 16:26:19 +0000 |
| commit | a7bc1f5a489cc599919e4f0cad5e9e72fb3a7506 (patch) | |
| tree | 9fbbf2dffa551a8ed097161286205e7ed0f88626 /scp2/source/ooo | |
| parent | be646a0b763e1688fbd4bc6cee0d3df79b90820b (diff) | |
#i122362# remove stlport4-build support
but keep the --without-stlport configure option for now
it is the new default anyway
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'scp2/source/ooo')
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 41 |
3 files changed, 0 insertions, 47 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index dc076f1068eb..857012a279f4 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -116,10 +116,6 @@ SCPDEFS+=-DSYSTEM_LIBXSLT SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR) .ENDIF -.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4" -SCPDEFS+=-DUSE_SYSTEM_STL -.ENDIF - .IF "$(WITH_MYSPELL_DICTS)" == "NO" SCPDEFS+=-DWITHOUT_MYSPELL_DICTS .ENDIF diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 3f8d2eae8979..a296f32f4dea 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -417,8 +417,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Wininetbe, gid_File_Lib_Macbe, gid_File_Lib_Gdiplus, - gid_File_Lib_Stlport_Vc6, - gid_File_Lib_Stlport_Vc7, gid_File_Tabaction, gid_File_Lib_Fps_Office, gid_File_Lib_Fpicker, diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index c5f9b9d79c46..5263b27f41ff 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -823,46 +823,6 @@ File gid_File_Dl_Libxml2 End #endif -#if !defined USE_SYSTEM_STL || \ - (defined USE_SYSTEM_STL && defined _C52 && defined IS_LP64) -File gid_File_Dl_Stlport - TXT_FILE_BODY; - Dir = SCP2_URE_DL_DIR; -#if defined _gcc3 && defined WNT -#if defined _STLP_DEBUG - Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug"); -#else - Name = SCP2_URE_DL_NORMAL("libstlport_gcc"); -#endif -#elif defined _gcc3 -#if defined _STLP_DEBUG - Name = SCP2_URE_DL_NORMAL("stlport_gcc_stldebug"); -#else - Name = SCP2_URE_DL_NORMAL("stlport_gcc"); -#endif -#elif defined SOLARIS -#if defined IS_LP64 - Name = SCP2_URE_DL_VER("stlport", "1"); -#else -#if defined _STLP_DEBUG - Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug"); -#else - Name = SCP2_URE_DL_NORMAL("stlport_sunpro"); -#endif -#endif -#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) ) -#if defined _STLP_DEBUG - Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45"); -#else - Name = SCP2_URE_DL_NORMAL("stlport_vc7145"); -#endif -#else -#error "stlport dynamic library: unsupported platform" -#endif - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -End -#endif - #if defined _gcc3 && !(defined NETBSD \ || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(OS2)) File gid_File_Dl_GccS @@ -1072,7 +1032,6 @@ Module gid_Module_Root_Ure_Hidden gid_File_Dl_Textoutstream, gid_File_Dl_Uuresolver, gid_File_Dl_Libxml2, - gid_File_Dl_Stlport, gid_File_Dl_GccS, gid_File_Dl_Stdcpp, gid_File_Lib_Mingw_GccS_Ure, |