diff options
| author | obo <obo@openoffice.org> | 2010-07-29 12:58:52 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-07-29 12:58:52 +0200 |
| commit | 44fa62ac789b6a594b1442113504b9e62c54f5ef (patch) | |
| tree | ee97ed31432856d74153968af18570a6a68370b5 /scp2 | |
| parent | a91d9cd8c4324aef2d16ea8a0be46a4d81ad702a (diff) | |
| parent | 9caf879e9ee09e25adb580a54b50cc79522a5123 (diff) | |
CWS-TOOLING: integrate CWS avmedia102
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 5 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 404a1588f344..d930b2dc9fa2 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1583,7 +1583,10 @@ STD_UNO_LIB_FILE( gid_File_Lib_Unoxml, unoxml ) // AVMedia STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia ) -#if defined UNX +#if defined UNX +#if defined ENABLE_GSTREAMER +SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst ) +#endif #ifdef SOLAR_JAVA UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia ) #endif diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 0777febdc869..a671447b5758 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -72,6 +72,10 @@ SCPDEFS+=-DGTK_TWO_FOUR SCPDEFS+=-DENABLE_SYSTRAY_GTK .ENDIF +.IF "$(ENABLE_GSTREAMER)" != "" +SCPDEFS+=-DENABLE_GSTREAMER +.ENDIF + .IF "$(ENABLE_KDE)" != "" SCPDEFS+=-DENABLE_KDE .ENDIF diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 19bdd6cc3c25..e8c20f99ca94 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -214,6 +214,7 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Svx, gid_File_Lib_AVMedia, gid_File_Lib_AVMediaWin, + gid_File_Lib_AVMediaGst, gid_File_Lib_BaseGfx, gid_File_Lib_Sysdtrans, gid_File_Lib_Sw, |