OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MacGui: Layout refinements courtesy of hawkman
[handbrake-jp/handbrake-jp-git.git]
/
Jamfile
diff --git
a/Jamfile
b/Jamfile
index
4f3fb04
..
656df38
100644
(file)
--- a/
Jamfile
+++ b/
Jamfile
@@
-15,7
+15,8
@@
HANDBRAKE_LIBS = libhb.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/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/libx264.a contrib/lib/libxvidcore.a
+ contrib/lib/libmkv.a contrib/lib/libswscale.a ;
if $(OS) = UNKNOWN
{
if $(OS) = UNKNOWN
{
@@
-60,7
+61,7
@@
if $(OS) = MACOSX
macosx/PictureController.h macosx/PictureController.mm
macosx/PictureGLView.h macosx/PictureGLView.mm
macosx/QueueController.h macosx/QueueController.mm
macosx/PictureController.h macosx/PictureController.mm
macosx/PictureGLView.h macosx/PictureGLView.mm
macosx/QueueController.h macosx/QueueController.mm
- macosx/
PrefsController.h macosx/Pref
sController.m
+ macosx/
HBPreferencesController.h macosx/HBPreference
sController.m
macosx/English.lproj/InfoPlist.strings
macosx/English.lproj/MainMenu.nib/classes.nib
macosx/English.lproj/MainMenu.nib/info.nib
macosx/English.lproj/InfoPlist.strings
macosx/English.lproj/MainMenu.nib/classes.nib
macosx/English.lproj/MainMenu.nib/info.nib
@@
-68,7
+69,11
@@
if $(OS) = MACOSX
macosx/ExpressController.h macosx/ExpressController.m
macosx/English.lproj/Express.nib/classes.nib
macosx/English.lproj/Express.nib/info.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/Express.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) ;
OSXApp HandBrake.app : $(OSX_SRC) $(HANDBRAKE_LIBS) ;