From 631e3dcf4b9b7c674634f06dc9ff06863ffe434c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 7 Sep 2010 10:19:35 +0000 Subject: [PATCH] * FFmpeg is not x86-only at all. The Jamfile tries to configure the build depending on the target architecture. * Add the folder for media plugins to home/config/add-ons. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38559 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 0e21371d6a..dcb6a4cc8b 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -140,7 +140,7 @@ SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon #legacy.media_addon ; SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder - aiff_reader asf_reader au_reader $(X86_ONLY)ffmpeg + aiff_reader asf_reader au_reader ffmpeg mov_reader musepack ogg raw_decoder speex $(X86_ONLY)ape_reader # theora @@ -575,6 +575,7 @@ AddDirectoryToHaikuImage home config add-ons kernel drivers dev ; AddDirectoryToHaikuImage home config add-ons input_server devices ; AddDirectoryToHaikuImage home config add-ons input_server filters ; AddDirectoryToHaikuImage home config add-ons input_server methods ; +AddDirectoryToHaikuImage home config add-ons media plugins ; AddDirectoryToHaikuImage home config add-ons Tracker ; AddDirectoryToHaikuImage home config add-ons Print ; AddDirectoryToHaikuImage home config add-ons Screen\ Savers ;