MacGui: Remove Preference introduced in rev 620 to make users enable 64bit mp4 option.

[handbrake-jp/handbrake-jp-git.git] / Makefile

diff --git a/Makefile b/Makefile
index 933cdda..655ee4f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ include Makefile.config
 SYSTEM = $(shell uname -s)
 
 # Special case for Mac OS X: everything is handled from the Xcode project
+
 ifeq ($(SYSTEM),Darwin)
 
 all:    clean app
@@ -19,10 +20,7 @@ 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 UDZO Handbrake.dmg ; rm -rf Handbrake )
-ifeq ($(SNAP), 1)
-       ( mv Handbrake.dmg Handbrake-$(HB_VERSION)-MacOS_UB.dmg )
-endif
+       (rm -rf HandBrake HandBrake*dmg ; mkdir -p HandBrake/api HandBrake/doc HandBrake/doc/pdf; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/doc ; cp -rp pdf/ HandBrake/doc/pdf/ ; 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 UDZO HandBrake-$(HB_VERSION)-MacOS_UB.dmg ; rm -rf HandBrake )
 
 endif
 
@@ -52,7 +50,13 @@ endif
 
 ifeq ($(SYSTEM),CYGWIN_NT-5.1)
 
-all:    contrib/.contrib libhb/libhb.a HandbrakeCLI
+all:    contrib/.contrib libhb/libhb.a 
+
+
+app:
+       (./DownloadCygWinContribBinaries.sh)
+HandbrakeCLI: app libhb/libhb.a
+
 
 contrib/.contrib:
        @$(MAKE) --no-print-directory -C contrib all
@@ -62,7 +66,9 @@ libhb/libhb.a:
 
 HandbrakeCLI:
        @$(MAKE) --no-print-directory -C test all
+       
 
+       
 clean:
        @$(MAKE) --no-print-directory -C libhb clean
        @$(MAKE) --no-print-directory -C test clean