Skip to content

Commit

Permalink
Merge branch 'master' of github.com:slembcke/CloudBomber
Browse files Browse the repository at this point in the history
  • Loading branch information
slembcke committed Jan 3, 2013
2 parents 44b1af5 + 1f8bd98 commit e1f95c0
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 8 deletions.
6 changes: 3 additions & 3 deletions CloudBomber.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,10 @@
fileType = pattern.proxy;
isEditable = 1;
outputFiles = (
"$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).png",
"$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE)-hd.png",
"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).png",
"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE)-hd.png",
);
script = "\"$PROJECT_DIR/Support/retinaconvert\" --dir \"$DERIVED_FILES_DIR\" --tag \"-hd\" \"$INPUT_FILE_PATH\"\n";
script = "\"$PROJECT_DIR/Support/retinaconvert\" --dir \"$DERIVED_FILE_DIR\" --tag \"-hd\" \"$INPUT_FILE_PATH\"";
};
/* End PBXBuildRule section */

Expand Down
3 changes: 0 additions & 3 deletions CloudBomber/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
Expand Down
20 changes: 20 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* Copyright (c) 2012 Scott Lembcke and Howling Moon Software
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
4 changes: 2 additions & 2 deletions Support/retinaconvert
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ def system(str)
end

def process(filename, outputname, tag, fmt)
system "#{IMAGECONVERT} 1.0 #{filename} #{outputname}#{tag}.#{fmt}"
system "#{IMAGECONVERT} 0.5 #{filename} #{outputname}.#{fmt}"
system "\"#{IMAGECONVERT}\" 1.0 \"#{filename}\" \"#{outputname}#{tag}.#{fmt}\""
system "\"#{IMAGECONVERT}\" 0.5 \"#{filename}\" \"#{outputname}.#{fmt}\""
end

require 'optparse'
Expand Down

0 comments on commit e1f95c0

Please sign in to comment.