X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=Jamfile;h=b0a2199588edad9e6ffb7a5ab0e9411a7a18a605;hb=f3ecb9ed626cda7181aae826f5f56602ff749932;hp=090798e958243aa6de5935eca60a1813df6effcf;hpb=f46cfe41e4d36215d8cd2f1a63bb110fa6b611f3;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/Jamfile b/Jamfile
index 090798e9..b0a21995 100644
--- a/Jamfile
+++ b/Jamfile
@@ -7,29 +7,44 @@
 SubDir TOP ;
 
 # libhb + contrib libraries
-HB_LIBS = libhb.a
+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/libdvdcss.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 ;
 
+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
 {
@@ -55,7 +70,7 @@ if $(OS) = MACOSX
               macosx/English.lproj/Express.nib/info.nib
               macosx/English.lproj/Express.nib/keyedobjects.nib ;
               
-    OSXApp HandBrake.app : $(OSX_SRC) $(HB_LIBS) ;
+    OSXApp HandBrake.app : $(OSX_SRC) $(HANDBRAKE_LIBS) ;
     
     # Package
     OSXPackage HandBrake-$(HB_VERSION)-OSX.zip : HandBrake.app ;
@@ -69,13 +84,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 ;
-