X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=Jamfile;h=86a6990497f44f7eb2c53ef4ad0d5b27d3eb1303;hb=3dd79f6623809ceb16c6d311d51a6c0f4cdbf5a3;hp=8d3b2a414e7602993a62f22e1fbbadd0fe3b4eee;hpb=42438ba9d05e81cf0561da1ed9cfb18cb5464940;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/Jamfile b/Jamfile
index 8d3b2a41..86a69904 100644
--- a/Jamfile
+++ b/Jamfile
@@ -6,16 +6,17 @@
 
 SubDir TOP ;
 
-# libmediafork + contrib libraries
-MEDIAFORK_LIBS = libmediafork.a
+# libhb + contrib libraries
+HANDBRAKE_LIBS = libhb.a
           contrib/lib/liba52.a        contrib/lib/libavformat.a
           contrib/lib/libavcodec.a    contrib/lib/libavutil.a
-          contrib/lib/libdvdread.a    contrib/lib/libmp4v2.a
-          contrib/lib/libfaac.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/libdca.a        contrib/lib/libdvdread.a
+          contrib/lib/libmp4v2.a      contrib/lib/libfaac.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/libmkv.a        contrib/lib/libswscale.a ;
 
 if $(OS) = UNKNOWN
 {
@@ -24,12 +25,13 @@ if $(OS) = UNKNOWN
 
 if $(OS) != CYGWIN
 {
-    MEDIAFORK_LIBS = $(MEDIAFORK_LIBS) contrib/lib/libdvdcss.a ;
+    HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libdvdcss.a ;
 }
 
 # Interfaces
-CLI_BIN = MediaForkCLI ;
-CLI_SRC = test/test.c ;
+CLI_BIN = HandBrakeCLI ;
+CLI_SRC = test/test.c 
+          test/parsecsv.c ;
 BEOS_BIN = HandBrake ;
 BEOS_SRC = beos/HBApp.cpp beos/MainWindow.cpp beos/ScanWindow.cpp
            beos/PicWindow.cpp beos/Stepper.cpp beos/QueueWindow.cpp ;
@@ -55,11 +57,11 @@ 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/HBQueueController.h macosx/HBQueueController.mm
+			  macosx/HBAdvancedController.h macosx/HBAdvancedController.m
+              macosx/HBPreferencesController.h macosx/HBPreferencesController.m
               macosx/English.lproj/InfoPlist.strings
               macosx/English.lproj/MainMenu.nib/classes.nib
               macosx/English.lproj/MainMenu.nib/info.nib
@@ -67,9 +69,23 @@ if $(OS) = MACOSX
               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/English.lproj/Express.nib/keyedobjects.nib
+              macosx/English.lproj/PictureSettings.nib/classes.nib
+              macosx/English.lproj/PictureSettings.nib/info.nib
+              macosx/English.lproj/PictureSettings.nib/keyedobjects.nib
+              macosx/English.lproj/AdvancedView.nib/classes.nib
+              macosx/English.lproj/AdvancedView.nib/info.nib
+              macosx/English.lproj/AdvancedView.nib/keyedobjects.nib
+			  macosx/English.lproj/Queue.nib
+              macosx/English.lproj/Queue.nib/classes.nib
+              macosx/English.lproj/Queue.nib/info.nib
+              macosx/English.lproj/Queue.nib/keyedobjects.nib
+              macosx/English.lproj/Preferences.nib
+              macosx/English.lproj/Preferences.nib/classes.nib
+              macosx/English.lproj/Preferences.nib/info.nib
+              macosx/English.lproj/Preferences.nib/keyedobjects.nib ;
               
-    OSXApp MediaFork.app : $(OSX_SRC) $(MEDIAFORK_LIBS) ;
+    OSXApp HandBrake.app : $(OSX_SRC) $(HANDBRAKE_LIBS) ;
     
     # Package
     OSXPackage HandBrake-$(HB_VERSION)-OSX.zip : HandBrake.app ;
@@ -85,12 +101,12 @@ if $(OS) = LINUX
 
 if $(OS) != MACOSX
 {
-	ObjectHdrs     $(UI_SRC) : $(TOP)/libmediafork ;
-	LinkLibraries  $(UI_BIN) : $(MEDIAFORK_LIBS) ;
+	ObjectHdrs     $(UI_SRC) : $(TOP)/libhb ;
+	LinkLibraries  $(UI_BIN) : $(HANDBRAKE_LIBS) ;
 }
 # Packages
 NotFile package ;
 Depends package : $(HB_PACKAGES) ;
 
 SubInclude TOP contrib ;
-SubInclude TOP libmediafork ;
+SubInclude TOP libhb ;