merged trunk into lua branch

plugin loading is disabled atm because of a bug reading the files (lua may be the reason). 
Reading the files in usdx and passing the contents to lua may solve this

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2019 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 26 insertions, 6 deletions

diff --git a/Lua/Makefile.in b/Lua/Makefile.in
index 839bbb8f..535f7dc9 100644
--- a/Lua/Makefile.in
+++ b/Lua/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,6 +215,7 @@ install-strip:
                 install
 
 .PHONY: install-all
+#install-all: install-exec install-plugins install-data
 install-all: install-exec install-data
 
 .PHONY: install-exec
@@ -220,6 +223,15 @@ 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 +277,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 +294,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)
 #################################################
@@ -364,20 +380,21 @@ 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/
+	$(MKDIR) $(macosx_bundle_path)/resources
+	$(INSTALL_DATA) icons/ultrastardx.icns $(macosx_bundle_path)/resources/
 
 # 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 ""
@@ -430,7 +447,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
@@ -449,3 +468,4 @@ clean-macosx-app:
 .PHONY: clean-macosx-dmg
 clean-macosx-dmg:
 	$(RM) UltraStarDeluxe.dmg 
+	$(RM) UltraStarDeluxe.sparseimage