Update ffmpeg to svn r15974, fixed up minor incompatiblities in the ffmpeg LATM diff...

[handbrake-jp/handbrake-jp-git.git] / Jamfile

diff --git a/Jamfile b/Jamfile
index 4f3fb04..ac3e794 100644 (file)
--- a/Jamfile
+++ b/Jamfile
@@ -1,7 +1,7 @@
 # $Id: Jamfile,v 1.86 2005/11/04 13:09:40 titer Exp $
 #
 # This file is part of the HandBrake source code.
-# Homepage: <http://handbrake.m0k.org/>.
+# Homepage: <http://handbrake.fr/>.
 # It may be used under the terms of the GNU General Public License.
 
 SubDir TOP ;
@@ -15,14 +15,21 @@ HANDBRAKE_LIBS = libhb.a
           contrib/lib/libmp3lame.a    contrib/lib/libmpeg2.a
           contrib/lib/libvorbis.a     contrib/lib/libvorbisenc.a
           contrib/lib/libogg.a        contrib/lib/libsamplerate.a
-          contrib/lib/libx264.a       contrib/lib/libxvidcore.a ;
+          contrib/lib/libx264.a       contrib/lib/libxvidcore.a
+          contrib/lib/libmkv.a        contrib/lib/libswscale.a
+          contrib/lib/libtheora.a     contrib/lib/libfaad.a ;
 
 if $(OS) = UNKNOWN
 {
     OS = CYGWIN ;
 }
 
-if $(OS) != CYGWIN
+if $(OS) = CYGWIN
+{
+    HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libbz2.a contrib/lib/libz.a ;
+}
+
+if $(CSS) = 1
 {
     HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libdvdcss.a ;
 }
@@ -56,19 +63,13 @@ if $(OS) = BEOS
 if $(OS) = MACOSX
 {
     OSX_SRC = macosx/main.mm macosx/Controller.h macosx/Controller.mm
-              macosx/ScanController.h macosx/ScanController.mm
               macosx/PictureController.h macosx/PictureController.mm
-              macosx/PictureGLView.h macosx/PictureGLView.mm
-              macosx/QueueController.h macosx/QueueController.mm
-              macosx/PrefsController.h macosx/PrefsController.m
-              macosx/English.lproj/InfoPlist.strings
-              macosx/English.lproj/MainMenu.nib/classes.nib
-              macosx/English.lproj/MainMenu.nib/info.nib
-              macosx/English.lproj/MainMenu.nib/keyedobjects.nib
-              macosx/ExpressController.h macosx/ExpressController.m
-              macosx/English.lproj/Express.nib/classes.nib
-              macosx/English.lproj/Express.nib/info.nib
-              macosx/English.lproj/Express.nib/keyedobjects.nib ;
+              macosx/HBQueueController.h macosx/HBQueueController.mm
+              macosx/HBAdvancedController.h macosx/HBAdvancedController.m
+              macosx/HBImageAndTextCell.h macosx/HBImageAndTextCell.m
+              macosx/HBPreferencesController.h macosx/HBPreferencesController.m
+              macosx/HBPresets.h macosx/HBPresets.m
+              macosx/English.lproj/InfoPlist.strings ;
               
     OSXApp HandBrake.app : $(OSX_SRC) $(HANDBRAKE_LIBS) ;