aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-03-04 18:06:26 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-03-04 18:06:26 +0000
commit65eed3b389761e9e5b9cf09c7c7456540ca10ce7 (patch)
treee0c48e8b9a0cb951e4725b8514f0528c313061bb
parent7ff32f8fb43868b06805a6a83550d87b41a07b8d (diff)
downloadusdx-65eed3b389761e9e5b9cf09c7c7456540ca10ce7.tar.gz
usdx-65eed3b389761e9e5b9cf09c7c7456540ca10ce7.tar.xz
usdx-65eed3b389761e9e5b9cf09c7c7456540ca10ce7.zip
Mac OS X only: change folder hierarchy in Application Support: delete Resources. Requires a new ./configure Attention: This requires manually moving all songs and anything else installed manually.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1618 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--Makefile.in8
-rw-r--r--src/base/UPlatformMacOSX.pas32
2 files changed, 20 insertions, 20 deletions
diff --git a/Makefile.in b/Makefile.in
index 839bbb8f..0a1113a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -364,20 +364,20 @@ macosx-app: all
@echo "Creating the Mac OS X application"
@echo ""
- $(MKDIR) $(macosx_bundle_path)/Resources
+ $(MKDIR) $(macosx_bundle_path)
# Put the icon file into its particular place.
# Must be done BEFORE info.plist is created.
- $(INSTALL_DATA) icons/ultrastardx.icns $(macosx_bundle_path)/Resources/
+ $(INSTALL_DATA) icons/ultrastardx.icns $(macosx_bundle_path)/
# the info.plist file
$(INSTALL_DATA) $(USDX_SRC_DIR)/macosx/Info.plist $(macosx_bundle_path)/
# Copy the resources.
- $(MAKE) install-all INSTALL_DATADIR=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS
+ $(MAKE) install-all INSTALL_DATADIR=$(macosx_bundle_path) bindir=$(macosx_bundle_path)/MacOS
# Create the song directory.
- $(MKDIR) $(macosx_bundle_path)/Resources/songs
+ $(MKDIR) $(macosx_bundle_path)/songs
# final messages
@echo ""
diff --git a/src/base/UPlatformMacOSX.pas b/src/base/UPlatformMacOSX.pas
index 9085e337..96e4bc63 100644
--- a/src/base/UPlatformMacOSX.pas
+++ b/src/base/UPlatformMacOSX.pas
@@ -70,19 +70,19 @@ type
*
* So
* GetGameSharedPath could return
- * /Library/Application Support/UltraStarDeluxe/Resources/.
+ * /Library/Application Support/UltraStarDeluxe/.
* GetGameUserPath could return
- * ~/Library/Application Support/UltraStarDeluxe/Resources/.
+ * ~/Library/Application Support/UltraStarDeluxe/.
*
- * Right now, only $HOME/Library/Application Support/UltraStarDeluxe/Resources
+ * Right now, only $HOME/Library/Application Support/UltraStarDeluxe
* is used. So every user needs the complete set of files and folders.
* Future versions may also use shared resources in
- * /Library/Application Support/UltraStarDeluxe/Resources. However, this is
+ * /Library/Application Support/UltraStarDeluxe. However, this is
* not treated yet in the code outside this unit.
*
* USDX checks, whether GetGameUserPath exists. If not, USDX creates it.
* The existence of needed files is then checked and if a file is missing
- * it is copied to there from within the Resources folder in the Application
+ * it is copied to there from within the folder Contents in the Application
* bundle, which contains the default files. USDX should not delete files or
* folders in Application Support/UltraStarDeluxe automatically or without
* user confirmation.
@@ -97,7 +97,7 @@ type
{**
* GetApplicationSupportPath returns the path to
- * $HOME/Library/Application Support/UltraStarDeluxe/Resources.
+ * $HOME/Library/Application Support/UltraStarDeluxe.
*}
function GetApplicationSupportPath: WideString;
@@ -109,8 +109,8 @@ type
public
{**
* Init simply calls @link(CreateUserFolders), which in turn scans the
- * folder UltraStarDeluxe.app/Contents/Resources for all files and
- * folders. $HOME/Library/Application Support/UltraStarDeluxe/Resources
+ * folder UltraStarDeluxe.app/Contents for all files and
+ * folders. $HOME/Library/Application Support/UltraStarDeluxe
* is then checked for their presence and missing ones are copied.
*}
procedure Init; override;
@@ -123,20 +123,20 @@ type
{**
* GetLogPath returns the path for log messages. Currently it is set to
- * $HOME/Library/Application Support/UltraStarDeluxe/Resources/Log.
+ * $HOME/Library/Application Support/UltraStarDeluxe/Log.
*}
function GetLogPath : WideString; override;
{**
* GetGameSharedPath returns the path for shared resources. Currently it
- * is set to /Library/Application Support/UltraStarDeluxe/Resources.
+ * is set to /Library/Application Support/UltraStarDeluxe.
* However it is not used.
*}
function GetGameSharedPath : WideString; override;
{**
* GetGameUserPath returns the path for user resources. Currently it is
- * set to $HOME/Library/Application Support/UltraStarDeluxe/Resources.
+ * set to $HOME/Library/Application Support/UltraStarDeluxe.
* This is where a user can add songs, themes, ....
*}
function GetGameUserPath : WideString; override;
@@ -156,7 +156,7 @@ end;
procedure TPlatformMacOSX.CreateUserFolders();
const
// used to construct the @link(UserPathName)
- PathName: string = '/Library/Application Support/UltraStarDeluxe/Resources';
+ PathName: string = '/Library/Application Support/UltraStarDeluxe';
var
RelativePath: string;
// BaseDir contains the path to the folder, where a search is performed.
@@ -186,12 +186,12 @@ begin
// finished.
GetDir(0, OldBaseDir);
- // UltraStarDeluxe.app/Contents/Resources contains all the default files and
+ // UltraStarDeluxe.app/Contents contains all the default files and
// folders.
- BaseDir := OldBaseDir + '/UltraStarDeluxe.app/Contents/Resources';
+ BaseDir := OldBaseDir + '/UltraStarDeluxe.app/Contents';
ChDir(BaseDir);
- // Right now, only $HOME/Library/Application Support/UltraStarDeluxe/Resources
+ // Right now, only $HOME/Library/Application Support/UltraStarDeluxe
// is used.
UserPathName := GetEnvironmentVariable('HOME') + PathName;
@@ -268,7 +268,7 @@ end;
function TPlatformMacOSX.GetApplicationSupportPath: WideString;
const
- PathName : string = '/Library/Application Support/UltraStarDeluxe/Resources';
+ PathName : string = '/Library/Application Support/UltraStarDeluxe';
begin
Result := GetEnvironmentVariable('HOME') + PathName + '/';
end;