X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=Jamfile;h=1abb22fbbcb65067c4f5549a42c588a1904fb549;hb=32ecca7581937f1f6ddc938b6fe509842f850676;hp=b4a8aca70b05752447ad3f87b02800e769ba537d;hpb=d05e3faf24daaffaf66a6244796eccceda8b2381;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/Jamfile b/Jamfile
index b4a8aca7..1abb22fb 100644
--- a/Jamfile
+++ b/Jamfile
@@ -1,65 +1,93 @@
-# $Id: Jamfile,v 1.40 2004/03/08 11:32:48 titer Exp $
+# $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 ;
 
-HB_PACKAGES = ;
-HB_LIBS     =  libhb.a liba52.a libavcodec.a libdvdplay.a libdvdread.a
-               libdvdcss.a libfaac.a libmp3lame.a libmp4v2.a libmpeg2.a
-	       libvorbis.a libvorbisenc.a libogg.a libx264.a
-	       libxvidcore.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/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 $(CSS) = 1
+{
+    HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libdvdcss.a ;
+}
+
+# Interfaces
+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   = $(CLI_BIN) $(BEOS_BIN) $(WX_BIN) ;
+UI_SRC   = $(CLI_SRC) $(BEOS_SRC) $(WX_SRC) ;
 
 # CLI app
-ObjectCcFlags test/test.c : -I$(TOP)/core -g -Wall ;
-LinkLibraries HBTest : $(HB_LIBS) ;
-Main HBTest : test/test.c ;
+# Don't build the CLI from here if MACOSX, let xcode build it :)
+if $(OS) != MACOSX
+{
+	Main $(CLI_BIN) : $(CLI_SRC) ;
+}
 
-# BeOS
 if $(OS) = BEOS
 {
-    SOURCES_BEOS = beos/HBApp.cpp beos/HBWindow.cpp ;
-    ObjectC++Flags $(SOURCES_BEOS) :
-        -I$(TOP)/core -I$(TOP)/beos/liblayout -g -Wall ;
-    LINKLIBS on HandBrake = $(LINKLIBS) -L$(TOP)/lib -llayout -lbe ;
-    LinkLibraries HandBrake : $(HB_LIBS) ;
-    Main HandBrake : $(SOURCES_BEOS) ;
-}
+    Main HandBrake : $(BEOS_SRC) ;
 
-# OS X
+    BeOSPackage HandBrake-$(HB_VERSION)-BeOS.zip : HandBrake ;
+    HB_PACKAGES += HandBrake-$(HB_VERSION)-BeOS.zip ;
+}
 if $(OS) = MACOSX
 {
-    # Build the app
-    OSXApp HandBrake.app ;
-    Depends HandBrake.app : $(HB_LIBS) macosx/Controller.h
-        macosx/Controller.mm macosx/PictureGLView.h
-	macosx/PictureGLView.mm ;
-    Depends all : HandBrake.app ;
+    OSX_SRC = macosx/main.mm macosx/Controller.h macosx/Controller.mm
+              macosx/PictureController.h macosx/PictureController.mm
+              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) ;
     
     # Package
-    OSXPackage HandBrake-$(HB_VERSION)-OSX.zip ;
-    Depends HandBrake-$(HB_VERSION)-OSX.zip : HandBrake.app ;
+    OSXPackage HandBrake-$(HB_VERSION)-OSX.zip : HandBrake.app ;
     HB_PACKAGES += HandBrake-$(HB_VERSION)-OSX.zip ;
 }
-
-# GTK2
 if $(OS) = LINUX
 {
-    SOURCES_GTK2 = gtk2/main.c gtk2/callbacks.c gtk2/interface.c
-                   gtk2/support.c ;
-    ObjectCcFlags $(SOURCES_GTK2) :
-        -I$(TOP)/core `pkg-config gtk+-2.0 --cflags` ;
-    LINKLIBS on gtk2HB = $(LINKLIBS) `pkg-config gtk+-2.0 --libs` ;
-    LinkLibraries gtk2HB : $(HB_LIBS) ;
-    Main gtk2HB : $(SOURCES_GTK2) ;
+    # WX UI outdated
+    #SystemLibraries $(WX_BIN) : -lpthread `wx-config --libs` ;
+    #ObjectC++Flags  $(WX_SRC) : `wx-config --cflags` ;
+    #Main            $(WX_BIN) : $(WX_SRC) ;
 }
 
+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 core ;
-
+SubInclude TOP libhb ;