[haiku-commits] r38559 - haiku/trunk/build/jam
- From: superstippi@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 7 Sep 2010 12:19:35 +0200 (CEST)
Author: stippi
Date: 2010-09-07 12:19:35 +0200 (Tue, 07 Sep 2010)
New Revision: 38559
Changeset: http://dev.haiku-os.org/changeset/38559
Modified:
haiku/trunk/build/jam/HaikuImage
Log:
* 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.
Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage 2010-09-07 08:04:00 UTC (rev 38558)
+++ haiku/trunk/build/jam/HaikuImage 2010-09-07 10:19:35 UTC (rev 38559)
@@ -140,7 +140,7 @@
#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 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 ;
Other related posts:
