From fee5ca25dcb18cbdcfb9406905ece5d65d21b88e Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Mon, 22 Aug 2011 13:08:07 +0200 Subject: remove Java piece from avmedia --- scp2/source/ooo/file_library_ooo.scp | 6 ------ scp2/source/ooo/module_hidden_ooo.scp | 1 - 2 files changed, 7 deletions(-) (limited to 'scp2') diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 2268ffefe720..f9376715c31b 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1466,17 +1466,11 @@ STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia ) #ifdef GSTREAMER SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst ) -#else -#if defined UNX -#ifdef SOLAR_JAVA -STD_JAR_FILE( gid_File_Jar_AVmedia, avmedia ) -#endif #elif defined WNT #ifdef ENABLE_DIRECTX SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin ) #endif #endif -#endif #ifndef WITHOUT_MOZILLA File gid_File_Lib_XSec_Framework diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 14febe0f54b4..1f79ee31a6a3 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -150,7 +150,6 @@ Module gid_Module_Root_Files_3 gid_File_Jar_Xml_Apis, gid_File_Jar_Bsh, gid_File_Jar_Classes, - gid_File_Jar_AVmedia, gid_File_Jar_Xsltfilter, gid_File_Jar_Xsltvalidate, gid_File_Jar_Docbook, -- cgit