From edab8ca00033f57365714ac1902b50ea89f642e8 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sat, 17 May 2008 20:25:08 +0000 Subject: Creating macosx-app with "make macosx-app". XCode building probably broken git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1107 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/MacOSX/Info.plist | 20 ++++++++++--- Game/Code/MacOSX/UltraStarDX.pas | 2 +- Game/Code/Makefile.in | 65 +++++++++++++++++++++++++++++++++++++++- Game/Code/switches.inc | 4 --- 4 files changed, 81 insertions(+), 10 deletions(-) (limited to 'Game/Code') diff --git a/Game/Code/MacOSX/Info.plist b/Game/Code/MacOSX/Info.plist index fab56642..178bc1e3 100644 --- a/Game/Code/MacOSX/Info.plist +++ b/Game/Code/MacOSX/Info.plist @@ -1,25 +1,37 @@ - + CFBundleDevelopmentRegion English + CFBundleDisplayName + UltraStar Deluxe CFBundleExecutable - ${PRODUCT_NAME} + UltraStar + CFBundleGetInfoString + UltraStar Deluxe, a SingStar clone CFBundleIconFile - ustar-icon_v01.icns + ustar-icon_v01 CFBundleIdentifier org.ultrastardeluxe.ultrastardeluxe CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + UltraStar Deluxe CFBundlePackageType APPL + CFBundleShortVersionString + 1.0 CFBundleSignature ???? CFBundleVersion 1.0 + LSExecutableArchitectures + i386 + NSAppleScriptEnabled + + NSHumanReadableCopyright + LGPL NSMainNibFile SDLMain NSPrincipalClass diff --git a/Game/Code/MacOSX/UltraStarDX.pas b/Game/Code/MacOSX/UltraStarDX.pas index 4e226b55..5e75ccf9 100644 --- a/Game/Code/MacOSX/UltraStarDX.pas +++ b/Game/Code/MacOSX/UltraStarDX.pas @@ -1,6 +1,6 @@ program UltraStarDX; -uses cthreads, cwstring, UMain, UMedia_dummy, UAudioPlayback_Bass, UAudioInput_Bass, USingNotes, UTextClasses, UVideo; +uses cthreads, UMain, UMedia_dummy, UAudioPlayback_Bass, UAudioInput_Bass, USingNotes, UTextClasses, UVideo; begin Main; diff --git a/Game/Code/Makefile.in b/Game/Code/Makefile.in index 0f3a21c5..5ad27020 100644 --- a/Game/Code/Makefile.in +++ b/Game/Code/Makefile.in @@ -242,7 +242,70 @@ $(debpkgname): all rpm: all # rpm - @echo "Comming soon" + @echo "Coming soon" + +macosx_bundle_path = ../../UltraStar\ Deluxe.app/Contents +macosx-app: all +# Create double clickable Mac OS X application. + + @echo "" + @echo "Creating the Mac OS X application" + @echo "" + install -d $(macosx_bundle_path)/MacOS + install -d $(macosx_bundle_path)/Resources + +# Strip symbols and copy the binary. + install -s ../../UltraStar $(macosx_bundle_path)/MacOS + +# Put the icon file into its particular place. +# Must be done BEFORE info.plist is created. + install ../../Resources/Graphics/ustar-icon_v01.icns $(macosx_bundle_path)/Resources/ + +# the info.plist file + install MacOSX/Info.plist $(macosx_bundle_path)/ + +# Copy the resources. +# This should be replaced by something like install-data and +# install-data-recursive and an adjusted prefix or so + install -d $(macosx_bundle_path)/Resources/Artwork + install ../../Artwork/* $(macosx_bundle_path)/Resources/Artwork + install -d $(macosx_bundle_path)/Resources/Languages + install ../../Languages/* $(macosx_bundle_path)/Resources/Languages + install -d $(macosx_bundle_path)/Resources/Resources/Fonts/Bold + install ../../Resources/Fonts/Bold/* $(macosx_bundle_path)/Resources/Resources/Fonts/Bold/ + install -d $(macosx_bundle_path)/Resources/Resources/Fonts/Normal + install ../../Resources/Fonts/Normal/* $(macosx_bundle_path)/Resources/Resources/Fonts/Normal/ + install -d $(macosx_bundle_path)/Resources/Resources/Fonts/Outline\ 1 + install ../../Resources/Fonts/Outline\ 1/* $(macosx_bundle_path)/Resources/Resources/Fonts/Outline\ 1/ + install -d $(macosx_bundle_path)/Resources/Resources/Fonts/Outline\ 2 + install ../../Resources/Fonts/Outline\ 2/* $(macosx_bundle_path)/Resources/Resources/Fonts/Outline\ 2/ + install -d $(macosx_bundle_path)/Resources/Resources/Graphics + install ../../Resources/Graphics/* $(macosx_bundle_path)/Resources/Resources/Graphics/ + install -d $(macosx_bundle_path)/Resources/Resources/Sounds + install ../../Resources/Sounds/* $(macosx_bundle_path)/Resources/Resources/Sounds/ + install -d $(macosx_bundle_path)/Resources/Sounds + install ../../Sounds/* $(macosx_bundle_path)/Resources/Sounds + install -d $(macosx_bundle_path)/Resources/Themes/Classic + install ../../Themes/Classic/* $(macosx_bundle_path)/Resources/Themes/Classic/ + install ../../Themes/Classic.ini $(macosx_bundle_path)/Resources/Themes + install -d $(macosx_bundle_path)/Resources/Themes/Deluxe + install ../../Themes/Deluxe/* $(macosx_bundle_path)/Resources/Themes/Deluxe/ + install ../../Themes/Deluxe.ini $(macosx_bundle_path)/Resources/Themes + install ../../License.txt $(macosx_bundle_path)/Resources/ + +# the empty dirs + install -d $(macosx_bundle_path)/Resources/Covers + install -d $(macosx_bundle_path)/Resources/Logs + install -d $(macosx_bundle_path)/Resources/Plugins + install -d $(macosx_bundle_path)/Resources/Screenshots + install -d $(macosx_bundle_path)/Resources/Visuals + +# final messages + @echo "" + @echo "Mac OS X application created." + @echo "Please report issues to the developer team, preferably mischi." + @echo "Have fun." + @echo "" clean: recursive-clean clean_obj diff --git a/Game/Code/switches.inc b/Game/Code/switches.inc index e47c319d..5ba4bb7a 100644 --- a/Game/Code/switches.inc +++ b/Game/Code/switches.inc @@ -67,9 +67,6 @@ // enable debug-mode. For development only! //{$DEFINE DEBUG} {$DEFINE CONSOLE} - - {$DEFINE HaveBASS} - {$DEFINE WIN32} {$DEFINE UTF8_FILENAMES} {$IFEND} @@ -113,4 +110,3 @@ {$IF Defined(UsePortaudioInput) or Defined(UsePortaudioPlayback)} {$DEFINE UsePortaudio} {$IFEND} - -- cgit v1.2.3