From: prigaux Date: Sat, 24 Feb 2007 09:01:39 +0000 (+0000) Subject: Makefile changes: X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef4955520366a5738d58783ebbb514dbe195ae20;p=handbrake Makefile changes: make -> build the app without libquicktime (on all platforms) make internal -> build the app with libquicktime on macosx for maurj tests git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2_5.1@407 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/Makefile b/Makefile index f932bbfe6..5b48891e9 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,13 @@ ifeq ($(SYSTEM),Darwin) all: clean app +dev: clean internal + app: - (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(HB_VERSION)\\\" -DHB_BUILD=$(HB_BUILD) " build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh HandBrake.app $(HB_VERSION) $(HB_BUILD)) ; rm -rf plugins ; mkdir plugins ; cp contrib/lib/libquicktime/* plugins + (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(HB_VERSION)\\\" -DHB_BUILD=$(HB_BUILD) " build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh HandBrake.app $(HB_VERSION) $(HB_BUILD) UB ) + +internal: + (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration Development OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(HB_VERSION)\\\" -DHB_BUILD=$(HB_BUILD) " build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh HandBrake.app $(HB_VERSION) $(HB_BUILD) DEV ) ; rm -rf plugins ; mkdir plugins ; cp contrib/lib/libquicktime/* plugins clean: (cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' ) @@ -17,6 +22,9 @@ mrproper: (rm -rf contrib/*tar.gz contrib/include contrib/lib contrib/DarwinContribVersion.txt ; cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' ) release: + (rm -rf Handbrake Handbrake.dmg ; mkdir -p Handbrake/api Handbrake/doc; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS Handbrake/doc ; cp -rp HandBrake.app Handbrake ; cp -rp libhb/libhb.dylib Handbrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h Handbrake/api ; cp -rp HandbrakeCLI Handbrake ; hdiutil create -srcfolder Handbrake -format UDBZ Handbrake.dmg ; rm -rf Handbrake ) + +releaseint: (rm -rf Handbrake Handbrake.dmg ; mkdir -p Handbrake/api Handbrake/doc; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS Handbrake/doc ; cp -rp HandBrake.app Handbrake ; cp -rp libhb/libhb.dylib Handbrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h Handbrake/api ; cp -rp HandbrakeCLI Handbrake ; cd HandBrake ; mkdir plugins ; cd plugins ; ln ../HandBrake.app/Contents/Resources/plugins/lqt_audiocodec.so ; ln ../HandBrake.app/Contents/Resources/plugins/lqt_faac.so ; ln ../HandBrake.app/Contents/Resources/plugins/lqt_ffmpeg.so; ln ../HandBrake.app/Contents/Resources/plugins/lqt_lame.so; ln ../HandBrake.app/Contents/Resources/plugins/lqt_rtjpeg.so ; ln ../HandBrake.app/Contents/Resources/plugins/lqt_videocodec.so ; ln ../HandBrake.app/Contents/Resources/plugins/lqt_x264.so; cd ../.. ; hdiutil create -srcfolder Handbrake -format UDBZ Handbrake.dmg ; rm -rf Handbrake ) endif diff --git a/libhb/Makefile b/libhb/Makefile index 72dd359fd..49feec89c 100644 --- a/libhb/Makefile +++ b/libhb/Makefile @@ -32,7 +32,7 @@ OBJS = $(OTMP:%.cpp=%.o) ifeq ($(SYSTEM),CYGWIN_NT-5.1) CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \ ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \ - ../contrib/lib/libdvdread.a ../contrib/lib/libquicktime.a \ + ../contrib/lib/libdvdread.a \ ../contrib/lib/libfaac.a ../contrib/lib/libmp3lame.a \ ../contrib/lib/libmpeg2.a ../contrib/lib/libmpeg2convert.a \ ../contrib/lib/libvorbis.a ../contrib/lib/libvorbisenc.a \ @@ -43,7 +43,6 @@ else CONTRIBS = ../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/libquicktime.a \ ../contrib/lib/libfaac.a ../contrib/lib/libmp3lame.a \ ../contrib/lib/libmpeg2.a ../contrib/lib/libmpeg2convert.a \ ../contrib/lib/libvorbis.a ../contrib/lib/libvorbisenc.a \ diff --git a/macosx/HandBrake.xcodeproj/pri.mode1 b/macosx/HandBrake.xcodeproj/pri.mode1 index ab691967e..385113e71 100644 --- a/macosx/HandBrake.xcodeproj/pri.mode1 +++ b/macosx/HandBrake.xcodeproj/pri.mode1 @@ -219,6 +219,8 @@ Layout + BecomeActive + ContentConfiguration PBXBottomSmartGroupGIDs @@ -256,27 +258,18 @@ 29B97314FDCFA39411CA2CEA 526FBC940B4CAA310064E04C + 526FBC8D0B4CA9F90064E04C 1C37FBAC04509CD000000102 - 0DFA5D330B8DDC6F0020BC09 - 0DFA5D340B8DDC6F0020BC09 - 0DFA5D350B8DDC6F0020BC09 - 0DFA5D360B8DDC6F0020BC09 - 0DFA5D370B8DDC6F0020BC09 - 0DFA5D380B8DDC6F0020BC09 - 0DFA5D390B8DDC6F0020BC09 - 0DFA5D3A0B8DDC6F0020BC09 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 28 - 13 - 12 + 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 185}, {186, 802}} + {{0, 0}, {186, 802}} PBXTopSmartGroupGIDs @@ -295,7 +288,7 @@ 186 RubberWindowFrame - 479 138 1118 861 0 0 1680 1028 + 273 167 1118 861 0 0 1680 1028 Module PBXSmartGroupTreeModule @@ -332,7 +325,7 @@ Frame {{0, 0}, {910, 0}} RubberWindowFrame - 479 138 1118 861 0 0 1680 1028 + 273 167 1118 861 0 0 1680 1028 Module PBXNavigatorGroup @@ -340,8 +333,6 @@ 0pt - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -354,7 +345,7 @@ Frame {{0, 5}, {910, 815}} RubberWindowFrame - 479 138 1118 861 0 0 1680 1028 + 273 167 1118 861 0 0 1680 1028 Module XCDetailModule @@ -378,9 +369,9 @@ TableOfContents - 0DFA5D010B8DD7D20020BC09 + 0D3065750B9030CE0049CCA4 1CE0B1FE06471DED0097A5F4 - 0DFA5D020B8DD7D20020BC09 + 0D3065760B9030CE0049CCA4 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -514,11 +505,10 @@ 5 WindowOrderList - 0DFA5CFA0B8DD7CF0020BC09 - /Users/pri/Desktop/mf8beta25.1/macosx/HandBrake.xcodeproj + /Users/pri/Desktop/HB/macosx/HandBrake.xcodeproj WindowString - 479 138 1118 861 0 0 1680 1028 + 273 167 1118 861 0 0 1680 1028 WindowTools diff --git a/macosx/HandBrake.xcodeproj/pri.pbxuser b/macosx/HandBrake.xcodeproj/pri.pbxuser index 5de48dbb3..d6247b7c6 100644 --- a/macosx/HandBrake.xcodeproj/pri.pbxuser +++ b/macosx/HandBrake.xcodeproj/pri.pbxuser @@ -92,192 +92,12 @@ sepNavVisRect = "{{0, 0}, {962, 387}}"; }; }; - 0DFA5D090B8DD9300020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "error: mediafork.h: No such file or directory"; - fRef = 4DF3C8CB052889CD00A80101 /* Controller.h */; - rLen = 1; - rLoc = 8; - rType = 1; - }; - 0DFA5D0A0B8DD9300020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4DF3C8CB052889CD00A80101 /* Controller.h */; - name = "#include \"mediafork.h\""; - rLen = 23; - rLoc = 253; - rType = 0; - vrLen = 366; - vrLoc = 0; - }; 0DFA5D0E0B8DD9FB0020BC09 /* XCBreakpointsBucket */ = { isa = XCBreakpointsBucket; name = "Project Breakpoints"; objects = ( ); }; - 0DFA5D110B8DDA190020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4DF3C8CB052889CD00A80101 /* Controller.h */; - name = "Controller.h: 217"; - rLen = 0; - rLoc = 7915; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 0DFA5D120B8DDA190020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "warning: (near initialization for 'hb_declpcm')"; - fRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; - rLen = 1; - rLoc = 19; - rType = 1; - }; - 0DFA5D130B8DDA190020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4DF3C8CB052889CD00A80101 /* Controller.h */; - name = "Controller.h: 217"; - rLen = 0; - rLoc = 7915; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 0DFA5D140B8DDA190020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; - name = "};"; - rLen = 3; - rLoc = 530; - rType = 0; - vrLen = 715; - vrLoc = 0; - }; - 0DFA5D200B8DDAED0020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; - name = "};"; - rLen = 3; - rLoc = 530; - rType = 0; - vrLen = 715; - vrLoc = 0; - }; - 0DFA5D210B8DDAED0020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "error: mediafork.h: No such file or directory"; - fRef = 526FBC760B4CA8F40064E04C /* test.c */; - rLen = 1; - rLoc = 12; - rType = 1; - }; - 0DFA5D220B8DDAED0020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; - name = "};"; - rLen = 3; - rLoc = 530; - rType = 0; - vrLen = 715; - vrLoc = 0; - }; - 0DFA5D230B8DDAED0020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 526FBC760B4CA8F40064E04C /* test.c */; - name = "#include \"hb.h\""; - rLen = 16; - rLoc = 322; - rType = 0; - vrLen = 795; - vrLoc = 0; - }; - 0DFA5D250B8DDB010020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 526FBC760B4CA8F40064E04C /* test.c */; - name = "#include \"hb.h\""; - rLen = 16; - rLoc = 322; - rType = 0; - vrLen = 795; - vrLoc = 0; - }; - 0DFA5D260B8DDB010020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "error: hb.h: No such file or directory"; - fRef = 4D1EA31A0993B24700FDC1A2 /* ExpressController.h */; - rLen = 1; - rLoc = 3; - rType = 1; - }; - 0DFA5D270B8DDB010020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 526FBC760B4CA8F40064E04C /* test.c */; - name = "#include \"hb.h\""; - rLen = 16; - rLoc = 322; - rType = 0; - vrLen = 795; - vrLoc = 0; - }; - 0DFA5D280B8DDB010020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4D1EA31A0993B24700FDC1A2 /* ExpressController.h */; - name = "#import \"hb.h\""; - rLen = 15; - rLoc = 49; - rType = 0; - vrLen = 872; - vrLoc = 0; - }; - 0DFA5D2A0B8DDB220020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4D1EA31A0993B24700FDC1A2 /* ExpressController.h */; - name = "#import \"hb.h\""; - rLen = 15; - rLoc = 49; - rType = 0; - vrLen = 872; - vrLoc = 0; - }; - 0DFA5D2E0B8DDC180020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4D1EA31A0993B24700FDC1A2 /* ExpressController.h */; - name = "#import \"hb.h\""; - rLen = 15; - rLoc = 49; - rType = 0; - vrLen = 872; - vrLoc = 0; - }; - 0DFA5D2F0B8DDC180020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "error: 'WORK_DECLPCM' undeclared here (not in a function)"; - fRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; - rLen = 1; - rLoc = 14; - rType = 1; - }; - 0DFA5D300B8DDC180020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4D1EA31A0993B24700FDC1A2 /* ExpressController.h */; - name = "#import \"hb.h\""; - rLen = 15; - rLoc = 49; - rType = 0; - vrLen = 872; - vrLoc = 0; - }; - 0DFA5D310B8DDC180020BC09 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; - name = "WORK_DECLPCM,"; - rLen = 18; - rLoc = 441; - rType = 0; - vrLen = 713; - vrLoc = 0; - }; 0DFF0B710B6BC6E600549488 /* libhb */ = { activeExec = 0; }; @@ -289,8 +109,8 @@ }; 29B97313FDCFA39411CA2CEA /* Project object */ = { activeBuildConfigurationName = UB; - activeExecutable = 0DFA5C560B8DD1760020BC09 /* HandBrake */; - activeTarget = 4DD93F8D082036E8008E1322 /* HandBrake */; + activeExecutable = 0DFA5C570B8DD1760020BC09 /* Instant HandBrake */; + activeTarget = 0D096DFE0B707D1200A845D4 /* libhb dlib */; addToTargets = ( 4DD93F8D082036E8008E1322 /* HandBrake */, ); @@ -346,29 +166,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 193843598; - PBXWorkspaceStateSaveDate = 193843598; - }; - perUserProjectItems = { - 0DFA5D090B8DD9300020BC09 /* PBXTextBookmark */ = 0DFA5D090B8DD9300020BC09 /* PBXTextBookmark */; - 0DFA5D0A0B8DD9300020BC09 /* PBXTextBookmark */ = 0DFA5D0A0B8DD9300020BC09 /* PBXTextBookmark */; - 0DFA5D110B8DDA190020BC09 /* PBXTextBookmark */ = 0DFA5D110B8DDA190020BC09 /* PBXTextBookmark */; - 0DFA5D120B8DDA190020BC09 /* PBXTextBookmark */ = 0DFA5D120B8DDA190020BC09 /* PBXTextBookmark */; - 0DFA5D130B8DDA190020BC09 /* PBXTextBookmark */ = 0DFA5D130B8DDA190020BC09 /* PBXTextBookmark */; - 0DFA5D140B8DDA190020BC09 /* PBXTextBookmark */ = 0DFA5D140B8DDA190020BC09 /* PBXTextBookmark */; - 0DFA5D200B8DDAED0020BC09 /* PBXTextBookmark */ = 0DFA5D200B8DDAED0020BC09 /* PBXTextBookmark */; - 0DFA5D210B8DDAED0020BC09 /* PBXTextBookmark */ = 0DFA5D210B8DDAED0020BC09 /* PBXTextBookmark */; - 0DFA5D220B8DDAED0020BC09 /* PBXTextBookmark */ = 0DFA5D220B8DDAED0020BC09 /* PBXTextBookmark */; - 0DFA5D230B8DDAED0020BC09 /* PBXTextBookmark */ = 0DFA5D230B8DDAED0020BC09 /* PBXTextBookmark */; - 0DFA5D250B8DDB010020BC09 /* PBXTextBookmark */ = 0DFA5D250B8DDB010020BC09 /* PBXTextBookmark */; - 0DFA5D260B8DDB010020BC09 /* PBXTextBookmark */ = 0DFA5D260B8DDB010020BC09 /* PBXTextBookmark */; - 0DFA5D270B8DDB010020BC09 /* PBXTextBookmark */ = 0DFA5D270B8DDB010020BC09 /* PBXTextBookmark */; - 0DFA5D280B8DDB010020BC09 /* PBXTextBookmark */ = 0DFA5D280B8DDB010020BC09 /* PBXTextBookmark */; - 0DFA5D2A0B8DDB220020BC09 /* PBXTextBookmark */ = 0DFA5D2A0B8DDB220020BC09 /* PBXTextBookmark */; - 0DFA5D2E0B8DDC180020BC09 /* PBXTextBookmark */ = 0DFA5D2E0B8DDC180020BC09 /* PBXTextBookmark */; - 0DFA5D2F0B8DDC180020BC09 /* PBXTextBookmark */ = 0DFA5D2F0B8DDC180020BC09 /* PBXTextBookmark */; - 0DFA5D300B8DDC180020BC09 /* PBXTextBookmark */ = 0DFA5D300B8DDC180020BC09 /* PBXTextBookmark */; - 0DFA5D310B8DDC180020BC09 /* PBXTextBookmark */ = 0DFA5D310B8DDC180020BC09 /* PBXTextBookmark */; + PBXPerProjectTemplateStateSaveDate = 193999038; + PBXWorkspaceStateSaveDate = 193999038; }; sourceControlManager = 0DFA5C680B8DD17A0020BC09 /* Source Control */; userBuildSettings = { diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 10a1ea97f..5dc600ac4 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -887,7 +887,6 @@ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 "; OTHER_LDFLAGS = ( ../contrib/lib/libmp4v2.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, ../contrib/lib/libavcodec.a, @@ -958,7 +957,6 @@ OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, @@ -1006,7 +1004,6 @@ LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, @@ -1045,7 +1042,6 @@ OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a, - ../contrib/lib/libquicktime.a, ../contrib/lib/libmp4v2.a, ../contrib/lib/liba52.a, ../contrib/lib/libavformat.a, diff --git a/macosx/localize.sh b/macosx/localize.sh index 8568c2d00..5c32cfcde 100755 --- a/macosx/localize.sh +++ b/macosx/localize.sh @@ -48,9 +48,11 @@ echo " " > Info.plist +if [ $4 == "DEV" ]; then echo Installing libquicktime Plugins in the $1 Bundle cd Resources mkdir plugins cd plugins cp ../../../../contrib/lib/libquicktime/* . +fi