X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=Jamfile;h=410b9e6f754b5dc601b975d7b60b0ae0fc91bb34;hb=71ee406c77c5334c275ae134c763eff7b03149e4;hp=8066a1bd928bae68316c2d881f2999d9c0b0bc49;hpb=cdba71d1dca214142fdcca4c52f7672252752c2e;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/Jamfile b/Jamfile
index 8066a1bd..410b9e6f 100644
--- a/Jamfile
+++ b/Jamfile
@@ -7,29 +7,45 @@
 SubDir TOP ;
 
 # libhb + contrib libraries
-HB_LIBS = libhb.a
-          contrib/lib/liba52.a        contrib/lib/libavcodec.a
-          contrib/lib/libavutil.a     contrib/lib/libdvdread.a
-          contrib/lib/libdvdcss.a     contrib/lib/libfaac.a
-          contrib/lib/libmp3lame.a    contrib/lib/libmp4v2.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 ;
+HANDBRAKE_LIBS = libhb.a
+          contrib/lib/liba52.a        contrib/lib/libavformat.a
+          contrib/lib/libavcodec.a    contrib/lib/libavutil.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
+{
+    OS = CYGWIN ;
+}
+
+if $(OS) != CYGWIN
+{
+    HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libdvdcss.a ;
+}
 
 # Interfaces
-TEST_BIN = HBTest ;
-TEST_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 ;
 WX_BIN   = wxHB ;
 WX_SRC   = wx/hbWizard.cpp wx/wxHB.cpp ;
-UI_BIN   = $(TEST_BIN) $(BEOS_BIN) $(WX_BIN) ;
-UI_SRC   = $(TEST_SRC) $(BEOS_SRC) $(WX_SRC) ;
+UI_BIN   = $(CLI_BIN) $(BEOS_BIN) $(WX_BIN) ;
+UI_SRC   = $(CLI_SRC) $(BEOS_SRC) $(WX_SRC) ;
 
 # CLI app
-Main $(TEST_BIN) : $(TEST_SRC) ;
+# Don't build the CLI from here if MACOSX, let xcode build it :)
+if $(OS) != MACOSX
+{
+	Main $(CLI_BIN) : $(CLI_SRC) ;
+}
 
 if $(OS) = BEOS
 {
@@ -41,16 +57,36 @@ 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/HBImageAndTextCell.h macosx/HBImageAndTextCell.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
-              macosx/English.lproj/MainMenu.nib/keyedobjects.nib ;
-    OSXApp HandBrake.app : $(OSX_SRC) $(HB_LIBS) ;
+              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/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 HandBrake.app : $(OSX_SRC) $(HANDBRAKE_LIBS) ;
     
     # Package
     OSXPackage HandBrake-$(HB_VERSION)-OSX.zip : HandBrake.app ;
@@ -64,13 +100,14 @@ if $(OS) = LINUX
     #Main            $(WX_BIN) : $(WX_SRC) ;
 }
 
-ObjectHdrs     $(UI_SRC) : $(TOP)/libhb ;
-LinkLibraries  $(UI_BIN) : $(HB_LIBS) ;
-
+if $(OS) != MACOSX
+{
+	ObjectHdrs     $(UI_SRC) : $(TOP)/libhb ;
+	LinkLibraries  $(UI_BIN) : $(HANDBRAKE_LIBS) ;
+}
 # Packages
 NotFile package ;
 Depends package : $(HB_PACKAGES) ;
 
 SubInclude TOP contrib ;
 SubInclude TOP libhb ;
-