X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=Jamfile;h=ac3e7948455256f7a03ca951e4266dcf283a5042;hb=b7ae72d3cda07d5b9a136f6934ed4e62b48d774c;hp=410b9e6f754b5dc601b975d7b60b0ae0fc91bb34;hpb=4dde8851c3319932e3f02bf9ff06b356a6c43ece;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/Jamfile b/Jamfile
index 410b9e6f..ac3e7948 100644
--- a/Jamfile
+++ b/Jamfile
@@ -1,7 +1,7 @@
 # $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 ;
@@ -16,14 +16,20 @@ HANDBRAKE_LIBS = libhb.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/libmkv.a        contrib/lib/libswscale.a
+          contrib/lib/libtheora.a     contrib/lib/libfaad.a ;
 
 if $(OS) = UNKNOWN
 {
     OS = CYGWIN ;
 }
 
-if $(OS) != CYGWIN
+if $(OS) = CYGWIN
+{
+    HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libbz2.a contrib/lib/libz.a ;
+}
+
+if $(CSS) = 1
 {
     HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libdvdcss.a ;
 }
@@ -58,33 +64,12 @@ if $(OS) = MACOSX
 {
     OSX_SRC = macosx/main.mm macosx/Controller.h macosx/Controller.mm
               macosx/PictureController.h macosx/PictureController.mm
-              macosx/PictureGLView.h macosx/PictureGLView.mm
               macosx/HBQueueController.h macosx/HBQueueController.mm
-			  macosx/HBAdvancedController.h macosx/HBAdvancedController.m
+              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
-              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 ;
+              macosx/HBPresets.h macosx/HBPresets.m
+              macosx/English.lproj/InfoPlist.strings ;
               
     OSXApp HandBrake.app : $(OSX_SRC) $(HANDBRAKE_LIBS) ;