From 3dc26d2e5c5b360f844ea23c3f60ea4178f6f883 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 23 Jul 2009 14:42:01 +0000
Subject: merge with current trunk revision 1827

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1855 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 unicode/Makefile.in | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'unicode/Makefile.in')

diff --git a/unicode/Makefile.in b/unicode/Makefile.in
index ad94259d..1b4f7707 100644
--- a/unicode/Makefile.in
+++ b/unicode/Makefile.in
@@ -58,6 +58,7 @@ USDX_GAME_DIR  := $(top_srcdir)/game
 USDX_TOOLS_DIR := $(top_srcdir)/tools
 USDX_BUILD_DIR := $(top_srcdir)/build
 USDX_LIB_DIR   := $(USDX_SRC_DIR)/lib
+USDX_PLUGIN_DIR   := $(top_srcdir)/plugins
 
 INSTALL_DATADIR := $(datadir)/$(USDX_PACKAGE_NAME)
 
@@ -113,6 +114,7 @@ BUILD_TARGETS = all debug release rebuild build
 .PHONY: $(BUILD_TARGETS)
 $(BUILD_TARGETS): all-deps
 	$(MAKE) -C $(USDX_SRC_DIR) $@
+	$(MAKE) -C $(USDX_PLUGIN_DIR) all
 
 .PHONY: all-deps
 all-deps:
@@ -213,13 +215,22 @@ install-strip:
                 install
 
 .PHONY: install-all
-install-all: install-exec install-data
+install-all: install-exec install-plugins install-data
 
 .PHONY: install-exec
 install-exec:
 	$(MKDIR) "$(DESTDIR)$(bindir)"
 	$(INSTALL_PROGRAM) "$(USDX_BIN)" "$(DESTDIR)$(bindir)"
 
+# FPC target platform and processor
+PPLATFORM  := @FPC_PLATFORM@
+PPROCESSOR := @FPC_PROCESSOR@
+
+.PHONY: install-plugins
+install-plugins:
+	$(MKDIR) "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
+	$(INSTALL) "$(USDX_GAME_DIR)/plugins"/* "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
+
 .PHONY: install-data
 install-data:
 	$(MAKE) RECURSIVE_SRC_DIR="artwork" \
@@ -265,7 +276,7 @@ install-data-recursive:
 uninstall: uninstall-all
 
 .PHONY: uninstall-all
-uninstall-all: uninstall-data uninstall-exec
+uninstall-all: uninstall-data uninstall-exec uninstall-plugins
 
 .PHONY: uninstall-data
 uninstall-data:
@@ -282,6 +293,10 @@ uninstall-data:
 uninstall-exec:
 	$(RM) "$(DESTDIR)$(bindir)/$(USDX_BIN_NAME)"
 
+.PHONY: uninstall-plugins
+uninstall-plugins:
+	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
+
 #################################################
 # Distributable source-package (TODO)
 #################################################
@@ -431,7 +446,9 @@ endef
 .PHONY: macosx-dmg
 macosx-dmg: macosx-standalone-app
 	$(RM) UltraStarDeluxe.dmg
-	$(HDIUTIL) create -type SPARSE -size 40m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
+	$(RM) UltraStarDeluxe.sparseimage
+	$(HDIUTIL) create -type SPARSE -size 100m -fs HFS+ -volname UltraStarDeluxe -ov UltraStarDeluxe.sparseimage
+	$(HDIUTIL) attach UltraStarDeluxe.sparseimage
 	/bin/cp -R UltraStarDeluxe.app /Volumes/UltraStarDeluxe
 #	/bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
 #	/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
@@ -450,3 +467,4 @@ clean-macosx-app:
 .PHONY: clean-macosx-dmg
 clean-macosx-dmg:
 	$(RM) UltraStarDeluxe.dmg 
+	$(RM) UltraStarDeluxe.sparseimage
-- 
cgit v1.2.3