Skip to content

Commit

Permalink
Move osx to support/osx
Browse files Browse the repository at this point in the history
  • Loading branch information
wader committed Mar 19, 2011
1 parent 4836c7d commit 9819b15
Show file tree
Hide file tree
Showing 14 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ or the custome build scripts way. If you dont plan to build for different
architectures or SDKs as you are current running, or dont plan to compile with
fancy extensions, i would recommend the MacPorts way.

If you choose the custome script way, please continue to read osx/README
If you choose the custome script way, please continue to read support/osx/README

MacPorts way:

Expand Down Expand Up @@ -103,7 +103,7 @@ include paths to your local build tree.

$ make Showtime.dmg

For more information read osx/README
For more information read support/osx/README

TODO: universal binary, cant be done i one step as ffmpeg does not
build when using multiple arch arguments to gcc
Expand Down
8 changes: 4 additions & 4 deletions support/osx.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ Showtime.app: \
${APPDIR}/Contents/MacOS:
mkdir -p $@

$(APPDIR)/Contents/Info.plist: osx/Info.plist
$(APPDIR)/Contents/Info.plist: support/osx/Info.plist
mkdir -p `dirname $@`
cp $< $@

$(APPDIR)/Contents/Resources/hts.icns: osx/hts.icns
$(APPDIR)/Contents/Resources/hts.icns: support/osx/hts.icns
mkdir -p `dirname $@`
cp $< $@

$(APPDIR)/Contents/Resources/MainMenu.nib: osx/MainMenu.xib
$(APPDIR)/Contents/Resources/MainMenu.nib: support/osx/MainMenu.xib
mkdir -p `dirname $@`
ibtool --compile $@ $<

Expand All @@ -41,5 +41,5 @@ endif
.PHONY: Showtime.dmg
Showtime.dmg:
support/osxchecknonsyslink.sh ${PROG}
support/mkdmg ${APPDIR} Showtime osx/hts.icns Showtime.dmg
support/mkdmg ${APPDIR} Showtime support/osx/hts.icns Showtime.dmg

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes

0 comments on commit 9819b15

Please sign in to comment.