diff options
Diffstat (limited to '')
| -rw-r--r-- | Game/Code/MacOSX/Info.plist | 20 | ||||
| -rw-r--r-- | Game/Code/MacOSX/UltraStarDX.pas | 2 | ||||
| -rw-r--r-- | Game/Code/Makefile.in | 65 | ||||
| -rw-r--r-- | Game/Code/switches.inc | 4 |
4 files changed, 81 insertions, 10 deletions
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 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> <string>English</string> + <key>CFBundleDisplayName</key> + <string>UltraStar Deluxe</string> <key>CFBundleExecutable</key> - <string>${PRODUCT_NAME}</string> + <string>UltraStar</string> + <key>CFBundleGetInfoString</key> + <string>UltraStar Deluxe, a SingStar clone</string> <key>CFBundleIconFile</key> - <string>ustar-icon_v01.icns</string> + <string>ustar-icon_v01</string> <key>CFBundleIdentifier</key> <string>org.ultrastardeluxe.ultrastardeluxe</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> - <string>${PRODUCT_NAME}</string> + <string>UltraStar Deluxe</string> <key>CFBundlePackageType</key> <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> <string>1.0</string> + <key>LSExecutableArchitectures</key> + <string>i386</string> + <key>NSAppleScriptEnabled</key> + <false/> + <key>NSHumanReadableCopyright</key> + <string>LGPL</string> <key>NSMainNibFile</key> <string>SDLMain</string> <key>NSPrincipalClass</key> 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}
-
|