summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2011-08-22 13:08:07 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2011-08-22 15:18:51 +0200
commitfee5ca25dcb18cbdcfb9406905ece5d65d21b88e (patch)
treefcef0434baa54a599dbcea9ba6e1890d9127014b /scp2
parentd39a1d4de93e0242dee84d4d298232da1986ebec (diff)
remove Java piece from avmedia
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_library_ooo.scp6
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp1
2 files changed, 0 insertions, 7 deletions
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,