Commit cfa722f1 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

MacOSX/VLC_app/VLC.xcodeproj: Fix copy phase.

MacOSX/Framework/Sources/VLCVideoCommon.m: Minor typo in previous commit.
parent 95160e3a
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
CGFloat xRatio = CGRectGetWidth(bounds)/originalVideoSize.width; CGFloat xRatio = CGRectGetWidth(bounds)/originalVideoSize.width;
CGFloat yRatio = CGRectGetHeight(bounds)/originalVideoSize.height; CGFloat yRatio = CGRectGetHeight(bounds)/originalVideoSize.height;
CGFloat ratio = fillScreenEntirely ? MAX(xRatio, yRatio) : MIX(xRatio, yRatio); CGFloat ratio = fillScreenEntirely ? MAX(xRatio, yRatio) : MIN(xRatio, yRatio);
videoRect.size.width = ratio*originalVideoSize.width; videoRect.size.width = ratio*originalVideoSize.width;
videoRect.size.height = ratio*originalVideoSize.height; videoRect.size.height = ratio*originalVideoSize.height;
......
...@@ -420,8 +420,7 @@ ...@@ -420,8 +420,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "if test \"$SYMROOT\" == \"$PROJECT_DIR/build\"\nthen\n\tVLCFRAMEWORK=\"$SRCROOT/../Framework/build/$CONFIGURATION/VLCKit.framework\"\nelse\n\tVLCFRAMEWORK=\"$SYMROOT/VLCKit.framework\"\nfi\n/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks $VLCFRAMEWORK $BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH\n\n\n"; shellScript = "if test \"$SYMROOT\" == \"$PROJECT_DIR/build\"\nthen\n\tVLCFRAMEWORK=\"$SRCROOT/../Framework/build/$CONFIGURATION/VLCKit.framework\"\nelse\n\tVLCFRAMEWORK=\"$SYMROOT/$CONFIGURATION/VLCKit.framework\"\nfi\n/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks $VLCFRAMEWORK $BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH\n\n\n";
showEnvVarsInLog = 0;
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment