X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=Jamfile;h=1abb22fbbcb65067c4f5549a42c588a1904fb549;hb=07cc0ebf6a7141a76fd9b6e2da6cf510def1ebc7;hp=c9c0450dabf6d790553e73771481d27b1543e5fc;hpb=45529a284d3aeedad92d7149f36dda0f06083b6a;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/Jamfile b/Jamfile
index c9c0450d..1abb22fb 100644
--- a/Jamfile
+++ b/Jamfile
@@ -1,45 +1,52 @@
# $Id: Jamfile,v 1.86 2005/11/04 13:09:40 titer Exp $
#
# This file is part of the HandBrake source code.
-# Homepage: .
+# Homepage: .
# It may be used under the terms of the GNU General Public License.
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/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
+ contrib/lib/libtheora.a contrib/lib/libfaad.a ;
if $(OS) = UNKNOWN
{
OS = CYGWIN ;
}
-if $(OS) != CYGWIN
+if $(CSS) = 1
{
- HB_LIBS = $(HB_LIBS) contrib/lib/libdvdcss.a ;
+ 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
{
@@ -51,21 +58,15 @@ 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) $(HB_LIBS) ;
+ OSXApp HandBrake.app : $(OSX_SRC) $(HANDBRAKE_LIBS) ;
# Package
OSXPackage HandBrake-$(HB_VERSION)-OSX.zip : HandBrake.app ;
@@ -79,13 +80,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 ;
-