From 1ba91d5a0e1df7419a561f6dcf16a0839509a5e7 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 27 Aug 2008 13:28:57 +0000
Subject: Reordering of the directories[1]: moving Game/Code to src

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1302 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 393 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 393 insertions(+)
 create mode 100644 src/Makefile.in

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
new file mode 100644
index 00000000..8fc31bd8
--- /dev/null
+++ b/src/Makefile.in
@@ -0,0 +1,393 @@
+#################################################
+# Makefile for @PACKAGE_STRING@
+# @configure_input@
+#################################################
+
+# general definitions
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+infodir = @infodir@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+datarootdir = @datarootdir@
+VPATH = @srcdir@
+usdxrootdir = @usdxrootdir@
+
+INSTALL_PATH_SUFFIX = @suffix@
+INSTALL_datadir = $(datarootdir)/$(INSTALL_PATH_SUFFIX)
+
+@SET_MAKE@
+
+# recursive dir creation tool
+MKDIR_P = @MKDIR_P@
+# install tool
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+# calls "ln -s"
+LN_S = @LN_S@
+
+# Package configuration
+USDX_PACKAGE_NAME = @PACKAGE_NAME@
+# should be $(USDX_PACKAGE_NAME) instead
+USDX_PREFIX = ultrastardx
+USDX_VERSION = @PACKAGE_VERSION@
+USDX_TARNAME = @PACKAGE_TARNAME@
+
+USDX_TOOLS_DIR = $(usdxrootdir)/Tools
+USDX_LIB_DIR   = ./lib
+USDX_BUILD_DIR = ./build
+
+# file-type suffix of executables (e.g. ".exe" in windows)
+EXE_SUFFIX = @EXEEXT@
+
+# Free Pascal compiler
+PPC = @PPC@
+# FPC target platform and processor
+PPLATFORM = @FPC_PLATFORM@
+PPROCESSOR = @FPC_PROCESSOR@
+
+EXTRA_SRCDIRS =
+
+# RC resource extraction config
+RESEXTRACTOR_NAME = ResourceExtractor
+RESEXTRACTOR_DIR = $(USDX_TOOLS_DIR)/$(RESEXTRACTOR_NAME)
+RESEXTRACTOR_BIN = $(RESEXTRACTOR_DIR)/$(RESEXTRACTOR_NAME)$(EXE_SUFFIX)
+RESOURCE_DIR = $(usdxrootdir)/Resources
+RESOURCE_FILE = resource.inc
+RC_FILE = UltraStar.rc
+EXTRA_SRCDIRS += $(RESEXTRACTOR_DIR)
+
+# cwrapper settings
+PROJECTM_CWRAPPER_DIR = $(USDX_LIB_DIR)/projectM/cwrapper
+@COMMENT_PROJECTM_CWRAPPER@EXTRA_SRCDIRS += $(PROJECTM_CWRAPPER_DIR)
+
+# Directories added to the unit path
+PUNIT_TOKEN = -Fu
+PUNIT_FLAGS = $(PUNIT_TOKEN).
+
+# Directory where compiled units (.ppu and .o files) are stored
+PCUNIT_TOKEN = -FU
+PCUNIT_DIR = $(USDX_BUILD_DIR)/$(PPLATFORM)/fpc
+PCUNIT_FLAGS = $(PCUNIT_TOKEN)$(PCUNIT_DIR)
+
+# Directories added to the includes path
+PINC_TOKEN = -Fi
+PINC_FLAGS = $(PINC_TOKEN)$(USDX_LIB_DIR)/JEDI-SDL/SDL/Pas
+
+# FPC flags
+
+# The user can overwrite the default flags with
+#   make PFLAGS_BASE="myflags"
+PFLAGS_BASE = -S2gi -vB
+# The user can specify additional flags with
+#   make PFLAGS_EXTRA="myflags"
+PFLAGS_EXTRA = @PFLAGS_EXTRA@
+PFLAGS_DEBUG   = @PFLAGS_DEBUG@
+PFLAGS_RELEASE = @PFLAGS_RELEASE@
+# the user's flags (specified with configure) must be the last in
+# the list to overwrite the defaults (e.g.with the - option: -Xs-).
+PFLAGS = $(PFLAGS_BASE) @PFLAGS_MAKE@ $(PFLAGS_EXTRA)
+
+LIBS = @LIBS@
+LDFLAGS = @LDFLAGS@
+linkflags = $(strip $(LDFLAGS) $(LIBS))
+ifneq ($(linkflags),)
+PLINKFLAGS = -k"$(linkflags)"
+endif
+
+# dpr project file used as input
+USDX_SRC = UltraStar.dpr
+# name of executable
+USDX_BIN_NAME = $(USDX_PREFIX)$(EXE_SUFFIX)
+USDX_BIN = $(usdxrootdir)/$(USDX_BIN_NAME)
+
+# name of the modification timestamp filename 
+modfile = lastmod
+
+# otool: Mac OS X object file displaying tool
+OTOOL = /usr/bin/otool 
+# install_name_tool: Mac OS X tool to change dynamic shared library install names
+INSTALL_NAME_TOOL = /usr/bin/install_name_tool
+# hdiutil: Mac OS X disk image tool
+HDIUTIL = /usr/bin/hdiutil
+
+#################################################
+# general targets
+#################################################
+
+.PHONY: debug release recursive all recursive-all dependencies install install-local install-global install-data install-data-recursive install-exec uninstall uninstall-local uninstall-global uninstall-data uninstall-exec clean recursive-clean distclean recursive-distclean clean_obj clean_res dist debian-package update-modfile $(EXTRA_SRCDIRS)
+
+debug: PFLAGS = $(PFLAGS_BASE) $(PFLAGS_DEBUG) $(PFLAGS_EXTRA)
+debug: all
+
+release: PFLAGS = $(PFLAGS_BASE) $(PFLAGS_RELEASE) $(PFLAGS_EXTRA)
+release: all
+
+all: recursive-all update-modfile dependencies $(USDX_BIN)
+
+recursive-all: recursive-target = all
+recursive-all: recursive
+
+dependencies: $(RESOURCE_FILE)
+
+# call Makefiles in other source-dirs
+recursive: $(EXTRA_SRCDIRS)
+$(EXTRA_SRCDIRS):
+	$(MAKE) -C $@ $(recursive-target)
+
+#################################################
+# build
+#################################################
+
+# clean old data before compiling, otherwise FPC might miss some changes.
+$(USDX_BIN): lastmod 
+	$(MAKE) clean_obj
+	mkdir -p "$(PCUNIT_DIR)"
+	$(PPC) $(strip $(PFLAGS) $(PDEFINES) $(PLINKFLAGS) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS)) -o$@ $(USDX_SRC)
+
+#################################################
+# install/uninstall
+#################################################
+
+install: all install-@install_type@
+
+uninstall: uninstall-@install_type@
+
+
+# local build
+
+install-local:
+
+uninstall-local:
+	rm -f "$(USDX_BIN)"
+
+
+# global build
+
+install-global: install-data install-exec
+
+install-data:
+	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Artwork" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Artwork" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Languages" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Languages" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Sounds" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Sounds" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Themes" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Themes" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Resources" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Resources" install-data-recursive
+	$(INSTALL_DATA) "$(usdxrootdir)/License.txt" "$(INSTALL_datadir)"
+
+install-data-recursive:
+	$(MKDIR_P) "$(RECURSIVE_DST_DIR)"
+	@for file in "$(RECURSIVE_SRC_DIR)"/*; do \
+	  if test -f "$$file"; then \
+	    echo $(INSTALL_DATA) "$$file" "$(RECURSIVE_DST_DIR)"; \
+	    $(INSTALL_DATA) "$$file" "$(RECURSIVE_DST_DIR)"; \
+	  fi; \
+	  if test -d "$$file"; then \
+	    subdir="$$file"; \
+	    subdirname=`basename "$$subdir"`; \
+	    $(MAKE) RECURSIVE_SRC_DIR="$$subdir" RECURSIVE_DST_DIR="$(RECURSIVE_DST_DIR)/$$subdirname" install-data-recursive; \
+	  fi; \
+	done
+
+install-exec:
+	$(MKDIR_P) "$(bindir)"
+	$(INSTALL) "$(USDX_BIN)" "$(bindir)"
+
+uninstall-global: uninstall-data uninstall-exec
+
+uninstall-data:
+	rm -rf "$(INSTALL_datadir)/Artwork"
+	rm -rf "$(INSTALL_datadir)/Languages"
+	rm -rf "$(INSTALL_datadir)/Sounds"
+	rm -rf "$(INSTALL_datadir)/Themes"
+	rm -rf "$(INSTALL_datadir)/Resources"
+	rm -f  "$(INSTALL_datadir)/License.txt"
+	-rmdir "$(INSTALL_datadir)"
+
+uninstall-exec:
+	rm -f "$(bindir)/$(USDX_BIN_NAME)"
+
+#################################################
+# Distributable source-package (TODO)
+#################################################
+
+disttmpdir = ./distdir
+
+dist:
+#	$(MKDIR_P) $(disttmpdir)
+#	acm $(usdxrootdir) $(disttmpdir)
+#	$(MAKE) -C $(disttmpdir)/Game/Code distclean 
+#	tar cvzf $(USDX_TARNAME)-$(USDX_VERSION).tar.gz $(usdxrootdir)
+	@echo "Comming soon"
+
+#################################################
+# Debian package
+#################################################
+
+debpkgoutdir = $(usdxrootdir)/packages
+debpkgtmpdir = $(debpkgoutdir)/deb-package
+# should be $(USDX_PACKAGE_NAME) instead
+debpkgprefix = ultrastardx
+debpkgname = $(debpkgprefix)_$(USDX_VERSION)_$(PPROCESSOR).deb
+
+debian-pkg: all
+	rm -rf $(debpkgtmpdir)
+	rm -rf $(debpkgoutdir)
+
+	$(MKDIR_P) $(debpkgoutdir)
+	$(MKDIR_P) $(debpkgtmpdir)/DEBIAN
+
+	$(MAKE) prefix=$(debpkgtmpdir)/$(prefix) install
+
+	$(INSTALL_DATA) $(debpkgprefix).control $(debpkgtmpdir)/DEBIAN/control
+
+	dpkg-deb --build $(debpkgtmpdir)
+	mv $(debpkgtmpdir)/../deb-package.deb $(debpkgoutdir)/$(debpkgname)
+
+	rm -rf $(debpkgtmpdir)
+
+#################################################
+# RPM (TODO)
+#################################################
+
+rpm: all
+	@echo "Coming soon"
+
+#################################################
+# Mac OS X app-bundle
+#################################################
+
+macosx_bundle_path = $(usdxrootdir)/UltraStarDeluxe.app/Contents
+macosx-app: all 
+# Create double clickable Mac OS X application.
+
+	@echo ""
+	@echo "Creating the Mac OS X application"
+	@echo ""
+
+	$(MKDIR_P) $(macosx_bundle_path)/Resources
+
+# Put the icon file into its particular place. 
+# Must be done BEFORE info.plist is created.
+	$(INSTALL_DATA) $(usdxrootdir)/Resources/Graphics/ustar-icon_v01.icns $(macosx_bundle_path)/Resources/
+
+# the info.plist file
+	$(INSTALL_DATA) MacOSX/Info.plist $(macosx_bundle_path)/
+
+# Copy the resources. 
+	$(MAKE) install-global INSTALL_datadir=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS
+
+# final messages
+	@echo ""
+	@echo "Mac OS X application created."
+	@echo "Please report issues to the developer team, preferably mischi."
+	@echo "Have fun."
+	@echo ""
+
+macosx-standalone-app: macosx-app 
+# Create double clickable standalone (does not need fink) Mac OS X 
+# application. Not fully test, but should work on 10.5.
+
+	@echo ""
+	@echo "Creating the standalone Mac OS X application"
+	@echo ""
+
+# copy the dylib and change its install names
+
+define install_osx_libraries
+    $(shell $(INSTALL) -m 755 $(dylib) $(macosx_bundle_path)/MacOS)
+    $(shell $(INSTALL_NAME_TOOL) -change $(dylib) @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/ultrastardx)
+    $(shell $(INSTALL_NAME_TOOL) -id @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
+    $(foreach linked_dylibs_2,$(shell $(OTOOL) -L $(dylib) | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \usr\/lib | grep -v executable_path),$(rename_secondary_osx_libraries))
+endef
+
+define rename_secondary_osx_libraries
+    $(shell $(INSTALL_NAME_TOOL) -change $(linked_dylibs_2) @executable_path/$(notdir $(linked_dylibs_2)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
+endef
+
+# work on the dylibs in $(macosx_bundle_path)/MacOS/ultrastardx
+	$(foreach dylib,$(shell $(OTOOL) -L $(macosx_bundle_path)/MacOS/ultrastardx | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+
+# work on the secondary dylibs from ffmpeg
+# libavcodec references all tertiary libraries of the ffmpeg libs
+	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libavcodec.dylib   | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+# same procedure in libfaac. it gets libgnugetopt
+	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libfaac.dylib      | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+
+# same procedure for tertiary libs in SDL_image
+	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libSDL_image.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+
+# X11 libs as well, because users may not have installed it on 10.4
+	$(foreach dylib,$(shell $(OTOOL) -L /usr/X11R6/lib/libX11.dylib  | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+
+# final messages
+	@echo "Standalone Mac OS X application created."
+	@echo ""
+
+macosx-disk-image: macosx-standalone-app
+	/bin/rm -f ultrastardx.dmg
+	$(HDIUTIL) create -type SPARSE -size 30m -fs HFS+ -volname UltraStarDeluxe -ov -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
+	$(HDIUTIL) detach /Volumes/UltraStarDeluxe
+	$(HDIUTIL) convert UltraStarDeluxe.sparseimage -format UDBZ -o ultrastardx.dmg
+	/bin/rm -f  UltraStarDeluxe.sparseimage
+#################################################
+# clean-up
+#################################################
+
+clean: recursive-clean clean_obj
+
+recursive-clean: recursive-target = clean
+recursive-clean: recursive
+
+distclean: recursive-distclean clean clean_res
+	find . -name "*.o" -o -name "*.ppu" -o -name "*.rst" -o -name "*.compiled" | xargs rm -f
+	find . -name "*~" -name "*.bak" -o -name "*.orig" -o -name "*.dcu" | xargs rm -f
+	find . -name "__history" | xargs rm -r -f
+	rm -f "$(USDX_PREFIX).res" "$(USDX_PREFIX).identcache"
+	rm -f config.inc Makefile config.log config.status configure aclocal.m4 
+	rm -rf autom4te.cache
+
+recursive-distclean: recursive-target = distclean
+recursive-distclean: recursive
+
+clean_obj:
+	find "$(PCUNIT_DIR)" -name "*.o" -o -name "*.ppu" -o -name "*.rst" -o -name "*.compiled" | xargs rm -f
+	rm -f "$(USDX_BIN)"
+
+#################################################
+# Resource-file
+#################################################
+
+$(RESOURCE_FILE): $(RC_FILE)
+	$(RESEXTRACTOR_BIN) $(RC_FILE) $(RESOURCE_DIR) $(RESOURCE_FILE)
+
+clean_res:
+	rm -f "$(RESOURCE_FILE)"
+
+#################################################
+# auto-update
+#################################################
+
+# FPC does not recognize changes correctly. E.g. sometimes changes in .inc-files or
+# conditional .pas dependencies are ignored which results in corrupted builds.
+# So check for changes with a modification timestamp.
+update-modfile:
+	test -e $(modfile) || touch $(modfile)
+	find . \( -name "*.pas" -o -name "*.pp" -o -name "*.inc" -o -name "*.dpr" \) -newer $(modfile) -exec touch $(modfile) \;
+	find $(USDX_LIB_DIR) -name "*.a" -newer $(modfile) -exec touch $(modfile) \;
+
+Makefile: Makefile.in config.status
+	./config.status
+
+config.status: configure
+	./config.status --recheck
+
+configure: configure.ac config.inc.in aclocal.m4
+	autoconf
+
+aclocal.m4: m4/*
+	aclocal -I m4
-- 
cgit v1.2.3


From 0d5d8e6041076b506ffa31cc108fda87d4cbae93 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 27 Aug 2008 16:36:42 +0000
Subject: project-files updated for new layout

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1315 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index 8fc31bd8..c2f58a47 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -35,7 +35,7 @@ USDX_PREFIX = ultrastardx
 USDX_VERSION = @PACKAGE_VERSION@
 USDX_TARNAME = @PACKAGE_TARNAME@
 
-USDX_TOOLS_DIR = $(usdxrootdir)/Tools
+USDX_TOOLS_DIR = $(usdxrootdir)/tools
 USDX_LIB_DIR   = ./lib
 USDX_BUILD_DIR = ./build
 
@@ -56,7 +56,7 @@ RESEXTRACTOR_DIR = $(USDX_TOOLS_DIR)/$(RESEXTRACTOR_NAME)
 RESEXTRACTOR_BIN = $(RESEXTRACTOR_DIR)/$(RESEXTRACTOR_NAME)$(EXE_SUFFIX)
 RESOURCE_DIR = $(usdxrootdir)/Resources
 RESOURCE_FILE = resource.inc
-RC_FILE = UltraStar.rc
+RC_FILE = ultrastardx.rc
 EXTRA_SRCDIRS += $(RESEXTRACTOR_DIR)
 
 # cwrapper settings
@@ -98,7 +98,7 @@ PLINKFLAGS = -k"$(linkflags)"
 endif
 
 # dpr project file used as input
-USDX_SRC = UltraStar.dpr
+USDX_SRC = ultrastardx.dpr
 # name of executable
 USDX_BIN_NAME = $(USDX_PREFIX)$(EXE_SUFFIX)
 USDX_BIN = $(usdxrootdir)/$(USDX_BIN_NAME)
@@ -169,7 +169,7 @@ uninstall-local:
 install-global: install-data install-exec
 
 install-data:
-	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Artwork" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Artwork" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/artwork" RECURSIVE_DST_DIR="$(INSTALL_datadir)/artwork" install-data-recursive
 	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Languages" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Languages" install-data-recursive
 	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Sounds" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Sounds" install-data-recursive
 	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Themes" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Themes" install-data-recursive
@@ -197,7 +197,7 @@ install-exec:
 uninstall-global: uninstall-data uninstall-exec
 
 uninstall-data:
-	rm -rf "$(INSTALL_datadir)/Artwork"
+	rm -rf "$(INSTALL_datadir)/artwork"
 	rm -rf "$(INSTALL_datadir)/Languages"
 	rm -rf "$(INSTALL_datadir)/Sounds"
 	rm -rf "$(INSTALL_datadir)/Themes"
@@ -217,7 +217,7 @@ disttmpdir = ./distdir
 dist:
 #	$(MKDIR_P) $(disttmpdir)
 #	acm $(usdxrootdir) $(disttmpdir)
-#	$(MAKE) -C $(disttmpdir)/Game/Code distclean 
+#	$(MAKE) -C $(disttmpdir)/src distclean 
 #	tar cvzf $(USDX_TARNAME)-$(USDX_VERSION).tar.gz $(usdxrootdir)
 	@echo "Comming soon"
 
@@ -273,7 +273,7 @@ macosx-app: all
 	$(INSTALL_DATA) $(usdxrootdir)/Resources/Graphics/ustar-icon_v01.icns $(macosx_bundle_path)/Resources/
 
 # the info.plist file
-	$(INSTALL_DATA) MacOSX/Info.plist $(macosx_bundle_path)/
+	$(INSTALL_DATA) macosx/Info.plist $(macosx_bundle_path)/
 
 # Copy the resources. 
 	$(MAKE) install-global INSTALL_datadir=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS
@@ -328,7 +328,7 @@ endef
 macosx-disk-image: macosx-standalone-app
 	/bin/rm -f ultrastardx.dmg
 	$(HDIUTIL) create -type SPARSE -size 30m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
-	/bin/cp -R ../../UltraStarDeluxe.app /Volumes/UltraStarDeluxe
+	/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
 	$(HDIUTIL) detach /Volumes/UltraStarDeluxe
-- 
cgit v1.2.3


From fdc8c343d6ebc7b043a27562dd51f1a51e507a46 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 27 Aug 2008 20:21:16 +0000
Subject: name and path change of icon file

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1323 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index c2f58a47..19e26c7c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -270,7 +270,7 @@ macosx-app: all
 
 # Put the icon file into its particular place. 
 # Must be done BEFORE info.plist is created.
-	$(INSTALL_DATA) $(usdxrootdir)/Resources/Graphics/ustar-icon_v01.icns $(macosx_bundle_path)/Resources/
+	$(INSTALL_DATA) $(usdxrootdir)/icons/ustar-icon_v01.icns $(macosx_bundle_path)/Resources/
 
 # the info.plist file
 	$(INSTALL_DATA) macosx/Info.plist $(macosx_bundle_path)/
-- 
cgit v1.2.3


From 03f2b92ecdbfe19ab9094dd4736a6f4d3f47203a Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 27 Aug 2008 21:03:50 +0000
Subject: - use lower-case paths: songs/themes/languages/etc. - adjustment for
 build-environment in game

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1329 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index 19e26c7c..2aea0943 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -35,6 +35,7 @@ USDX_PREFIX = ultrastardx
 USDX_VERSION = @PACKAGE_VERSION@
 USDX_TARNAME = @PACKAGE_TARNAME@
 
+USDX_GAME_DIR  = $(usdxrootdir)/game
 USDX_TOOLS_DIR = $(usdxrootdir)/tools
 USDX_LIB_DIR   = ./lib
 USDX_BUILD_DIR = ./build
@@ -54,7 +55,7 @@ EXTRA_SRCDIRS =
 RESEXTRACTOR_NAME = ResourceExtractor
 RESEXTRACTOR_DIR = $(USDX_TOOLS_DIR)/$(RESEXTRACTOR_NAME)
 RESEXTRACTOR_BIN = $(RESEXTRACTOR_DIR)/$(RESEXTRACTOR_NAME)$(EXE_SUFFIX)
-RESOURCE_DIR = $(usdxrootdir)/Resources
+RESOURCE_DIR = $(USDX_GAME_DIR)/resources
 RESOURCE_FILE = resource.inc
 RC_FILE = ultrastardx.rc
 EXTRA_SRCDIRS += $(RESEXTRACTOR_DIR)
@@ -101,7 +102,7 @@ endif
 USDX_SRC = ultrastardx.dpr
 # name of executable
 USDX_BIN_NAME = $(USDX_PREFIX)$(EXE_SUFFIX)
-USDX_BIN = $(usdxrootdir)/$(USDX_BIN_NAME)
+USDX_BIN = $(USDX_GAME_DIR)/$(USDX_BIN_NAME)
 
 # name of the modification timestamp filename 
 modfile = lastmod
@@ -170,10 +171,10 @@ install-global: install-data install-exec
 
 install-data:
 	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/artwork" RECURSIVE_DST_DIR="$(INSTALL_datadir)/artwork" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Languages" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Languages" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Sounds" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Sounds" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Themes" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Themes" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Resources" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Resources" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/languages" RECURSIVE_DST_DIR="$(INSTALL_datadir)/languages" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/sounds" RECURSIVE_DST_DIR="$(INSTALL_datadir)/sounds" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/themes" RECURSIVE_DST_DIR="$(INSTALL_datadir)/themes" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/resources" RECURSIVE_DST_DIR="$(INSTALL_datadir)/resources" install-data-recursive
 	$(INSTALL_DATA) "$(usdxrootdir)/License.txt" "$(INSTALL_datadir)"
 
 install-data-recursive:
@@ -198,10 +199,10 @@ uninstall-global: uninstall-data uninstall-exec
 
 uninstall-data:
 	rm -rf "$(INSTALL_datadir)/artwork"
-	rm -rf "$(INSTALL_datadir)/Languages"
-	rm -rf "$(INSTALL_datadir)/Sounds"
-	rm -rf "$(INSTALL_datadir)/Themes"
-	rm -rf "$(INSTALL_datadir)/Resources"
+	rm -rf "$(INSTALL_datadir)/languages"
+	rm -rf "$(INSTALL_datadir)/sounds"
+	rm -rf "$(INSTALL_datadir)/themes"
+	rm -rf "$(INSTALL_datadir)/resources"
 	rm -f  "$(INSTALL_datadir)/License.txt"
 	-rmdir "$(INSTALL_datadir)"
 
@@ -225,25 +226,23 @@ dist:
 # Debian package
 #################################################
 
-debpkgoutdir = $(usdxrootdir)/packages
-debpkgtmpdir = $(debpkgoutdir)/deb-package
-# should be $(USDX_PACKAGE_NAME) instead
-debpkgprefix = ultrastardx
+debpkgdir = $(usdxrootdir)/dists/debian
+debpkgtmpdir = $(debpkgdir)/deb-package
+debpkgprefix = $(USDX_PACKAGE_NAME)
 debpkgname = $(debpkgprefix)_$(USDX_VERSION)_$(PPROCESSOR).deb
 
 debian-pkg: all
 	rm -rf $(debpkgtmpdir)
-	rm -rf $(debpkgoutdir)
 
-	$(MKDIR_P) $(debpkgoutdir)
+	$(MKDIR_P) $(debpkgdir)
 	$(MKDIR_P) $(debpkgtmpdir)/DEBIAN
 
 	$(MAKE) prefix=$(debpkgtmpdir)/$(prefix) install
 
-	$(INSTALL_DATA) $(debpkgprefix).control $(debpkgtmpdir)/DEBIAN/control
+	$(INSTALL_DATA) $(debpkgdir)/$(debpkgprefix).control $(debpkgtmpdir)/DEBIAN/control
 
 	dpkg-deb --build $(debpkgtmpdir)
-	mv $(debpkgtmpdir)/../deb-package.deb $(debpkgoutdir)/$(debpkgname)
+	mv $(debpkgtmpdir)/../deb-package.deb $(debpkgdir)/$(debpkgname)
 
 	rm -rf $(debpkgtmpdir)
 
@@ -270,7 +269,7 @@ macosx-app: all
 
 # Put the icon file into its particular place. 
 # Must be done BEFORE info.plist is created.
-	$(INSTALL_DATA) $(usdxrootdir)/icons/ustar-icon_v01.icns $(macosx_bundle_path)/Resources/
+	$(INSTALL_DATA) $(usdxrootdir)/icons/ultrastardx.icns $(macosx_bundle_path)/Resources/
 
 # the info.plist file
 	$(INSTALL_DATA) macosx/Info.plist $(macosx_bundle_path)/
-- 
cgit v1.2.3


From 2ab22bdad1415813a3e1df329640332702272fc0 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 1 Sep 2008 17:01:58 +0000
Subject: - new configure/make layout:   - configure/main-makefile moved to
 root-dir   - configure-script checked in (no need to call autogen.sh on first
 run)   - autogen.sh, m4, install.sh etc. moved to dists/autogen/   -
 config.guess/sub for canonical builds - unit-tests moved to test - removed
 delphi subdir in portaudio/-mixer - COPYING.txt/AUTHORS.txt/... added -
 dists/delphi7/2005 added

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1334 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 392 --------------------------------------------------------
 1 file changed, 392 deletions(-)
 delete mode 100644 src/Makefile.in

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
deleted file mode 100644
index 2aea0943..00000000
--- a/src/Makefile.in
+++ /dev/null
@@ -1,392 +0,0 @@
-#################################################
-# Makefile for @PACKAGE_STRING@
-# @configure_input@
-#################################################
-
-# general definitions
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-infodir = @infodir@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-datarootdir = @datarootdir@
-VPATH = @srcdir@
-usdxrootdir = @usdxrootdir@
-
-INSTALL_PATH_SUFFIX = @suffix@
-INSTALL_datadir = $(datarootdir)/$(INSTALL_PATH_SUFFIX)
-
-@SET_MAKE@
-
-# recursive dir creation tool
-MKDIR_P = @MKDIR_P@
-# install tool
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-# calls "ln -s"
-LN_S = @LN_S@
-
-# Package configuration
-USDX_PACKAGE_NAME = @PACKAGE_NAME@
-# should be $(USDX_PACKAGE_NAME) instead
-USDX_PREFIX = ultrastardx
-USDX_VERSION = @PACKAGE_VERSION@
-USDX_TARNAME = @PACKAGE_TARNAME@
-
-USDX_GAME_DIR  = $(usdxrootdir)/game
-USDX_TOOLS_DIR = $(usdxrootdir)/tools
-USDX_LIB_DIR   = ./lib
-USDX_BUILD_DIR = ./build
-
-# file-type suffix of executables (e.g. ".exe" in windows)
-EXE_SUFFIX = @EXEEXT@
-
-# Free Pascal compiler
-PPC = @PPC@
-# FPC target platform and processor
-PPLATFORM = @FPC_PLATFORM@
-PPROCESSOR = @FPC_PROCESSOR@
-
-EXTRA_SRCDIRS =
-
-# RC resource extraction config
-RESEXTRACTOR_NAME = ResourceExtractor
-RESEXTRACTOR_DIR = $(USDX_TOOLS_DIR)/$(RESEXTRACTOR_NAME)
-RESEXTRACTOR_BIN = $(RESEXTRACTOR_DIR)/$(RESEXTRACTOR_NAME)$(EXE_SUFFIX)
-RESOURCE_DIR = $(USDX_GAME_DIR)/resources
-RESOURCE_FILE = resource.inc
-RC_FILE = ultrastardx.rc
-EXTRA_SRCDIRS += $(RESEXTRACTOR_DIR)
-
-# cwrapper settings
-PROJECTM_CWRAPPER_DIR = $(USDX_LIB_DIR)/projectM/cwrapper
-@COMMENT_PROJECTM_CWRAPPER@EXTRA_SRCDIRS += $(PROJECTM_CWRAPPER_DIR)
-
-# Directories added to the unit path
-PUNIT_TOKEN = -Fu
-PUNIT_FLAGS = $(PUNIT_TOKEN).
-
-# Directory where compiled units (.ppu and .o files) are stored
-PCUNIT_TOKEN = -FU
-PCUNIT_DIR = $(USDX_BUILD_DIR)/$(PPLATFORM)/fpc
-PCUNIT_FLAGS = $(PCUNIT_TOKEN)$(PCUNIT_DIR)
-
-# Directories added to the includes path
-PINC_TOKEN = -Fi
-PINC_FLAGS = $(PINC_TOKEN)$(USDX_LIB_DIR)/JEDI-SDL/SDL/Pas
-
-# FPC flags
-
-# The user can overwrite the default flags with
-#   make PFLAGS_BASE="myflags"
-PFLAGS_BASE = -S2gi -vB
-# The user can specify additional flags with
-#   make PFLAGS_EXTRA="myflags"
-PFLAGS_EXTRA = @PFLAGS_EXTRA@
-PFLAGS_DEBUG   = @PFLAGS_DEBUG@
-PFLAGS_RELEASE = @PFLAGS_RELEASE@
-# the user's flags (specified with configure) must be the last in
-# the list to overwrite the defaults (e.g.with the - option: -Xs-).
-PFLAGS = $(PFLAGS_BASE) @PFLAGS_MAKE@ $(PFLAGS_EXTRA)
-
-LIBS = @LIBS@
-LDFLAGS = @LDFLAGS@
-linkflags = $(strip $(LDFLAGS) $(LIBS))
-ifneq ($(linkflags),)
-PLINKFLAGS = -k"$(linkflags)"
-endif
-
-# dpr project file used as input
-USDX_SRC = ultrastardx.dpr
-# name of executable
-USDX_BIN_NAME = $(USDX_PREFIX)$(EXE_SUFFIX)
-USDX_BIN = $(USDX_GAME_DIR)/$(USDX_BIN_NAME)
-
-# name of the modification timestamp filename 
-modfile = lastmod
-
-# otool: Mac OS X object file displaying tool
-OTOOL = /usr/bin/otool 
-# install_name_tool: Mac OS X tool to change dynamic shared library install names
-INSTALL_NAME_TOOL = /usr/bin/install_name_tool
-# hdiutil: Mac OS X disk image tool
-HDIUTIL = /usr/bin/hdiutil
-
-#################################################
-# general targets
-#################################################
-
-.PHONY: debug release recursive all recursive-all dependencies install install-local install-global install-data install-data-recursive install-exec uninstall uninstall-local uninstall-global uninstall-data uninstall-exec clean recursive-clean distclean recursive-distclean clean_obj clean_res dist debian-package update-modfile $(EXTRA_SRCDIRS)
-
-debug: PFLAGS = $(PFLAGS_BASE) $(PFLAGS_DEBUG) $(PFLAGS_EXTRA)
-debug: all
-
-release: PFLAGS = $(PFLAGS_BASE) $(PFLAGS_RELEASE) $(PFLAGS_EXTRA)
-release: all
-
-all: recursive-all update-modfile dependencies $(USDX_BIN)
-
-recursive-all: recursive-target = all
-recursive-all: recursive
-
-dependencies: $(RESOURCE_FILE)
-
-# call Makefiles in other source-dirs
-recursive: $(EXTRA_SRCDIRS)
-$(EXTRA_SRCDIRS):
-	$(MAKE) -C $@ $(recursive-target)
-
-#################################################
-# build
-#################################################
-
-# clean old data before compiling, otherwise FPC might miss some changes.
-$(USDX_BIN): lastmod 
-	$(MAKE) clean_obj
-	mkdir -p "$(PCUNIT_DIR)"
-	$(PPC) $(strip $(PFLAGS) $(PDEFINES) $(PLINKFLAGS) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS)) -o$@ $(USDX_SRC)
-
-#################################################
-# install/uninstall
-#################################################
-
-install: all install-@install_type@
-
-uninstall: uninstall-@install_type@
-
-
-# local build
-
-install-local:
-
-uninstall-local:
-	rm -f "$(USDX_BIN)"
-
-
-# global build
-
-install-global: install-data install-exec
-
-install-data:
-	$(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/artwork" RECURSIVE_DST_DIR="$(INSTALL_datadir)/artwork" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/languages" RECURSIVE_DST_DIR="$(INSTALL_datadir)/languages" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/sounds" RECURSIVE_DST_DIR="$(INSTALL_datadir)/sounds" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/themes" RECURSIVE_DST_DIR="$(INSTALL_datadir)/themes" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/resources" RECURSIVE_DST_DIR="$(INSTALL_datadir)/resources" install-data-recursive
-	$(INSTALL_DATA) "$(usdxrootdir)/License.txt" "$(INSTALL_datadir)"
-
-install-data-recursive:
-	$(MKDIR_P) "$(RECURSIVE_DST_DIR)"
-	@for file in "$(RECURSIVE_SRC_DIR)"/*; do \
-	  if test -f "$$file"; then \
-	    echo $(INSTALL_DATA) "$$file" "$(RECURSIVE_DST_DIR)"; \
-	    $(INSTALL_DATA) "$$file" "$(RECURSIVE_DST_DIR)"; \
-	  fi; \
-	  if test -d "$$file"; then \
-	    subdir="$$file"; \
-	    subdirname=`basename "$$subdir"`; \
-	    $(MAKE) RECURSIVE_SRC_DIR="$$subdir" RECURSIVE_DST_DIR="$(RECURSIVE_DST_DIR)/$$subdirname" install-data-recursive; \
-	  fi; \
-	done
-
-install-exec:
-	$(MKDIR_P) "$(bindir)"
-	$(INSTALL) "$(USDX_BIN)" "$(bindir)"
-
-uninstall-global: uninstall-data uninstall-exec
-
-uninstall-data:
-	rm -rf "$(INSTALL_datadir)/artwork"
-	rm -rf "$(INSTALL_datadir)/languages"
-	rm -rf "$(INSTALL_datadir)/sounds"
-	rm -rf "$(INSTALL_datadir)/themes"
-	rm -rf "$(INSTALL_datadir)/resources"
-	rm -f  "$(INSTALL_datadir)/License.txt"
-	-rmdir "$(INSTALL_datadir)"
-
-uninstall-exec:
-	rm -f "$(bindir)/$(USDX_BIN_NAME)"
-
-#################################################
-# Distributable source-package (TODO)
-#################################################
-
-disttmpdir = ./distdir
-
-dist:
-#	$(MKDIR_P) $(disttmpdir)
-#	acm $(usdxrootdir) $(disttmpdir)
-#	$(MAKE) -C $(disttmpdir)/src distclean 
-#	tar cvzf $(USDX_TARNAME)-$(USDX_VERSION).tar.gz $(usdxrootdir)
-	@echo "Comming soon"
-
-#################################################
-# Debian package
-#################################################
-
-debpkgdir = $(usdxrootdir)/dists/debian
-debpkgtmpdir = $(debpkgdir)/deb-package
-debpkgprefix = $(USDX_PACKAGE_NAME)
-debpkgname = $(debpkgprefix)_$(USDX_VERSION)_$(PPROCESSOR).deb
-
-debian-pkg: all
-	rm -rf $(debpkgtmpdir)
-
-	$(MKDIR_P) $(debpkgdir)
-	$(MKDIR_P) $(debpkgtmpdir)/DEBIAN
-
-	$(MAKE) prefix=$(debpkgtmpdir)/$(prefix) install
-
-	$(INSTALL_DATA) $(debpkgdir)/$(debpkgprefix).control $(debpkgtmpdir)/DEBIAN/control
-
-	dpkg-deb --build $(debpkgtmpdir)
-	mv $(debpkgtmpdir)/../deb-package.deb $(debpkgdir)/$(debpkgname)
-
-	rm -rf $(debpkgtmpdir)
-
-#################################################
-# RPM (TODO)
-#################################################
-
-rpm: all
-	@echo "Coming soon"
-
-#################################################
-# Mac OS X app-bundle
-#################################################
-
-macosx_bundle_path = $(usdxrootdir)/UltraStarDeluxe.app/Contents
-macosx-app: all 
-# Create double clickable Mac OS X application.
-
-	@echo ""
-	@echo "Creating the Mac OS X application"
-	@echo ""
-
-	$(MKDIR_P) $(macosx_bundle_path)/Resources
-
-# Put the icon file into its particular place. 
-# Must be done BEFORE info.plist is created.
-	$(INSTALL_DATA) $(usdxrootdir)/icons/ultrastardx.icns $(macosx_bundle_path)/Resources/
-
-# the info.plist file
-	$(INSTALL_DATA) macosx/Info.plist $(macosx_bundle_path)/
-
-# Copy the resources. 
-	$(MAKE) install-global INSTALL_datadir=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS
-
-# final messages
-	@echo ""
-	@echo "Mac OS X application created."
-	@echo "Please report issues to the developer team, preferably mischi."
-	@echo "Have fun."
-	@echo ""
-
-macosx-standalone-app: macosx-app 
-# Create double clickable standalone (does not need fink) Mac OS X 
-# application. Not fully test, but should work on 10.5.
-
-	@echo ""
-	@echo "Creating the standalone Mac OS X application"
-	@echo ""
-
-# copy the dylib and change its install names
-
-define install_osx_libraries
-    $(shell $(INSTALL) -m 755 $(dylib) $(macosx_bundle_path)/MacOS)
-    $(shell $(INSTALL_NAME_TOOL) -change $(dylib) @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/ultrastardx)
-    $(shell $(INSTALL_NAME_TOOL) -id @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
-    $(foreach linked_dylibs_2,$(shell $(OTOOL) -L $(dylib) | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \usr\/lib | grep -v executable_path),$(rename_secondary_osx_libraries))
-endef
-
-define rename_secondary_osx_libraries
-    $(shell $(INSTALL_NAME_TOOL) -change $(linked_dylibs_2) @executable_path/$(notdir $(linked_dylibs_2)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
-endef
-
-# work on the dylibs in $(macosx_bundle_path)/MacOS/ultrastardx
-	$(foreach dylib,$(shell $(OTOOL) -L $(macosx_bundle_path)/MacOS/ultrastardx | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
-
-# work on the secondary dylibs from ffmpeg
-# libavcodec references all tertiary libraries of the ffmpeg libs
-	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libavcodec.dylib   | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
-# same procedure in libfaac. it gets libgnugetopt
-	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libfaac.dylib      | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
-
-# same procedure for tertiary libs in SDL_image
-	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libSDL_image.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
-
-# X11 libs as well, because users may not have installed it on 10.4
-	$(foreach dylib,$(shell $(OTOOL) -L /usr/X11R6/lib/libX11.dylib  | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
-
-# final messages
-	@echo "Standalone Mac OS X application created."
-	@echo ""
-
-macosx-disk-image: macosx-standalone-app
-	/bin/rm -f ultrastardx.dmg
-	$(HDIUTIL) create -type SPARSE -size 30m -fs HFS+ -volname UltraStarDeluxe -ov -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
-	$(HDIUTIL) detach /Volumes/UltraStarDeluxe
-	$(HDIUTIL) convert UltraStarDeluxe.sparseimage -format UDBZ -o ultrastardx.dmg
-	/bin/rm -f  UltraStarDeluxe.sparseimage
-#################################################
-# clean-up
-#################################################
-
-clean: recursive-clean clean_obj
-
-recursive-clean: recursive-target = clean
-recursive-clean: recursive
-
-distclean: recursive-distclean clean clean_res
-	find . -name "*.o" -o -name "*.ppu" -o -name "*.rst" -o -name "*.compiled" | xargs rm -f
-	find . -name "*~" -name "*.bak" -o -name "*.orig" -o -name "*.dcu" | xargs rm -f
-	find . -name "__history" | xargs rm -r -f
-	rm -f "$(USDX_PREFIX).res" "$(USDX_PREFIX).identcache"
-	rm -f config.inc Makefile config.log config.status configure aclocal.m4 
-	rm -rf autom4te.cache
-
-recursive-distclean: recursive-target = distclean
-recursive-distclean: recursive
-
-clean_obj:
-	find "$(PCUNIT_DIR)" -name "*.o" -o -name "*.ppu" -o -name "*.rst" -o -name "*.compiled" | xargs rm -f
-	rm -f "$(USDX_BIN)"
-
-#################################################
-# Resource-file
-#################################################
-
-$(RESOURCE_FILE): $(RC_FILE)
-	$(RESEXTRACTOR_BIN) $(RC_FILE) $(RESOURCE_DIR) $(RESOURCE_FILE)
-
-clean_res:
-	rm -f "$(RESOURCE_FILE)"
-
-#################################################
-# auto-update
-#################################################
-
-# FPC does not recognize changes correctly. E.g. sometimes changes in .inc-files or
-# conditional .pas dependencies are ignored which results in corrupted builds.
-# So check for changes with a modification timestamp.
-update-modfile:
-	test -e $(modfile) || touch $(modfile)
-	find . \( -name "*.pas" -o -name "*.pp" -o -name "*.inc" -o -name "*.dpr" \) -newer $(modfile) -exec touch $(modfile) \;
-	find $(USDX_LIB_DIR) -name "*.a" -newer $(modfile) -exec touch $(modfile) \;
-
-Makefile: Makefile.in config.status
-	./config.status
-
-config.status: configure
-	./config.status --recheck
-
-configure: configure.ac config.inc.in aclocal.m4
-	autoconf
-
-aclocal.m4: m4/*
-	aclocal -I m4
-- 
cgit v1.2.3


From 90256c7f975df47db109b583c7ae23b7e1e1c1d2 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 1 Sep 2008 17:23:55 +0000
Subject: - new configure/make layout:   - configure/main-makefile moved to
 root-dir   - configure-script checked in (no need to call autogen.sh on first
 run)   - autogen.sh, m4, install.sh etc. moved to dists/autogen/   -
 config.guess/sub for canonical builds - unit-tests moved to test - removed
 delphi subdir in portaudio/-mixer - COPYING.txt/AUTHORS.txt/... added -
 dists/delphi7/2005 added

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1335 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 206 insertions(+)
 create mode 100644 src/Makefile.in

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
new file mode 100644
index 00000000..bcb07a91
--- /dev/null
+++ b/src/Makefile.in
@@ -0,0 +1,206 @@
+#################################################
+# @PACKAGE_STRING@
+# @configure_input@
+#################################################
+
+@SET_MAKE@
+
+#################################################
+# Standard definitions
+#################################################
+
+# project root-dir (directory of configure script)
+top_srcdir  ?= @top_srcdir@
+# project src-dir (directory of the current Makefile)
+srcdir      ?= @srcdir@
+
+# file-type suffix of executables (e.g. ".exe" in windows)
+EXEEXT ?= @EXEEXT@
+
+#################################################
+# Tools
+#################################################
+
+# recursive dir creation tool (mkdir -p)
+MKDIR     ?= @MKDIR_P@
+RM        ?= rm -f
+RM_REC    ?= $(RM) -r
+
+#################################################
+# USDX Paths
+#################################################
+
+USDX_SRC_DIR   := $(top_srcdir)/src
+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
+
+#################################################
+# RC -> resource.inc
+#################################################
+
+# RC resource extraction config
+RESEXTRACTOR_DIR := $(USDX_TOOLS_DIR)/ResourceExtractor
+RESEXTRACTOR_BIN := $(RESEXTRACTOR_DIR)/ResourceExtractor$(EXEEXT)
+RESOURCE_DIR  := $(USDX_GAME_DIR)/resources
+RESOURCE_FILE := $(srcdir)/resource.inc
+RC_FILE       := $(srcdir)/ultrastardx.rc
+
+#################################################
+# FPC config
+#################################################
+
+# Free Pascal compiler binary
+PPC := @PPC@
+# FPC target platform and processor
+PPLATFORM  := @FPC_PLATFORM@
+PPROCESSOR := @FPC_PROCESSOR@
+
+# Directories added to the unit path
+PUNIT_FLAGS := -Fu.
+
+# Directory where compiled units (.ppu and .o files) are stored
+PCUNIT_DIR   := $(USDX_BUILD_DIR)/fpc-$(PPROCESSOR)-$(PPLATFORM)
+PCUNIT_FLAGS := -FU$(PCUNIT_DIR)
+
+# Directories added to the includes path
+PINC_FLAGS := -Fi$(USDX_LIB_DIR)/JEDI-SDL/SDL/Pas
+
+PFLAGS_BASE    ?= -S2gi -vB
+PFLAGS_EXTRA   ?= @PFLAGS_EXTRA@
+PFLAGS_DEBUG   ?= @PFLAGS_DEBUG@
+PFLAGS_RELEASE ?= @PFLAGS_RELEASE@
+# user-flags (specified with configure) must be last in
+# list to overwrite defaults (e.g. the "-"-option: -Xs-).
+PFLAGS         ?= $(PFLAGS_BASE) @PFLAGS_MAKE@ $(PFLAGS_EXTRA)
+
+LIBS       ?= @LIBS@
+LDFLAGS    ?= @LDFLAGS@
+linkflags  := $(strip $(LDFLAGS) $(LIBS))
+ifneq ($(linkflags),)
+PLINKFLAGS := -k"$(linkflags)"
+endif
+
+#################################################
+# USDX project config
+#################################################
+
+# dpr project file used as input
+USDX_PROJ := ultrastardx.dpr
+# name of executable
+USDX_BIN_NAME ?= ultrastardx$(EXEEXT)
+USDX_BIN := $(USDX_GAME_DIR)/$(USDX_BIN_NAME)
+
+#################################################
+# ProjectM
+#################################################
+
+PROJECTM_CWRAPPER_DIR := $(USDX_LIB_DIR)/projectM/cwrapper
+PROJECTM_CWRAPPER_LIB := $(PROJECTM_CWRAPPER_DIR)/libprojectM-cwrapper.a
+USE_PROJECTM_CWRAPPER = @USE_PROJECTM_CWRAPPER@
+
+#################################################
+# Static libs
+#################################################
+
+STATIC_LIBS := 
+ifeq ($(USE_PROJECTM_CWRAPPER), yes)
+STATIC_LIBS += $(PROJECTM_CWRAPPER_LIB)
+endif
+
+#################################################
+# general targets
+#################################################
+
+INC_FILES = $(shell find -name "*.inc")
+PAS_FILES = $(shell find -name "*.pas" -o -name "*.pp")
+BIN_DEPS = 
+
+.PHONY: all
+all: rebuild
+
+# one shot debug build
+.PHONY: debug
+debug: PFLAGS := $(PFLAGS_BASE) $(PFLAGS_DEBUG) $(PFLAGS_EXTRA)
+debug: rebuild
+
+# one shot release build
+.PHONY: release
+release: PFLAGS := $(PFLAGS_BASE) $(PFLAGS_RELEASE) $(PFLAGS_EXTRA)
+release: rebuild
+
+# build, but always clean old data before compiling.
+# FPC does not reliably recognize changes in .inc-files, static libs
+# (and maybe even conditional .pas) dependencies. This might result
+# in corrupted builds and renders debugging difficult.
+# Clean if any (%) file changed.
+.PHONY: rebuild
+rebuild: CLEANON_PATTERN := %
+rebuild: $(USDX_BIN)
+
+# Use FPC to determine if the sources have to be rebuild.
+# This does not work if an .inc or a static lib (e.g. .a) changed so we will
+# manually clean in these cases. FPC might even miss some changes in 
+# .pas files so we prefer the rebuild target.
+# Clean if an inc-file (%.inc) or static lib (%.a) changed.
+.PHONY: build
+build: CLEANON_PATTERN := %.inc %.a
+build: $(USDX_BIN)
+
+#################################################
+# build
+#################################################
+
+# After expansion of the expression, check_clean will
+# contain the first changed prerequisite ($?) that matches
+# CLEANON_PATTERN. It is used to check if any prerequisite of CLEANON_PATTERN
+# type changed (we just return the first word to avoid spaces in 
+# the result that might crash "test x$(check_clean)").
+check_clean = $(firstword $(filter $(CLEANON_PATTERN), $?))
+
+$(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(INC_FILES) $(PAS_FILES)
+	@echo "==================================="
+	@echo "Changed files:"
+	@echo "$?"
+	@echo "==================================="
+
+# Checks if a rebuild is required.
+# This is the case if any file matching $CLEANON_PATTERN changed.
+	@if test x$(check_clean) != x; then \
+	  echo "-----------------------------------"; \
+	  echo "Clean objects..."; \
+	  $(MAKE) clean_obj; \
+	  echo "-----------------------------------"; \
+	fi
+
+	$(MKDIR) "$(PCUNIT_DIR)"
+	$(PPC) $(strip $(PFLAGS) $(PDEFINES) $(PLINKFLAGS) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS)) -o$@ $(USDX_PROJ)
+
+#################################################
+# Resource-file
+#################################################
+
+$(RESOURCE_FILE): $(RC_FILE)
+	$(RESEXTRACTOR_BIN) $(RC_FILE) $(RESOURCE_DIR) $(RESOURCE_FILE)
+
+
+#################################################
+# clean-up
+#################################################
+
+.PHONY: clean
+clean: clean_obj clean_res
+
+.PHONY: clean_res
+clean_res:
+	$(RM) "$(RESOURCE_FILE)"
+
+.PHONY: clean_obj
+clean_obj: clean_bin
+	$(RM_REC) "$(PCUNIT_DIR)"
+	-rmdir "$(USDX_BUILD_DIR)"
+
+.PHONY: clean_bin
+clean_bin:
+	$(RM) "$(USDX_BIN)"
-- 
cgit v1.2.3


From e91cea0605045951a3df208d73d93026fef31e8f Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 1 Sep 2008 22:39:06 +0000
Subject: added start path "." for find. Mac OS X still needs it.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1336 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index bcb07a91..8bdbca40 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -113,8 +113,8 @@ endif
 # general targets
 #################################################
 
-INC_FILES = $(shell find -name "*.inc")
-PAS_FILES = $(shell find -name "*.pas" -o -name "*.pp")
+INC_FILES = $(shell find . -name "*.inc")
+PAS_FILES = $(shell find . -name "*.pas" -o -name "*.pp")
 BIN_DEPS = 
 
 .PHONY: all
-- 
cgit v1.2.3


From 5e1dd23ad5ed2fe8b0a618a9f9e10eac1694fe2b Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 9 Sep 2008 12:50:50 +0000
Subject: - better conformance of Makefiles to GNU coding standards   -
 bindir/prefix, etc. can be changed anytime make is performed and is not
 hardcoded on configure time anymore   - paths are written to the intermediate
 paths.inc file (instead of config-xyz.inc)   - binary is not stripped anymore
 - fpc.m4 rewrite   - additional options like heaptrace, range-checks   -
 noexecstack workaround   - some more changes - configure.ac helper functions
 moved to ax_ectract_version.m4 and pkg_config_utils.m4 - some icons moved
 from artwork to icons

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1351 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 171 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 118 insertions(+), 53 deletions(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index 8bdbca40..534fe73f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -4,11 +4,16 @@
 #################################################
 
 @SET_MAKE@
+SHELL = /bin/sh
 
 #################################################
 # Standard definitions
 #################################################
 
+prefix      ?= @prefix@
+exec_prefix ?= @exec_prefix@
+datarootdir ?= @datarootdir@
+datadir     ?= @datadir@
 # project root-dir (directory of configure script)
 top_srcdir  ?= @top_srcdir@
 # project src-dir (directory of the current Makefile)
@@ -26,6 +31,14 @@ MKDIR     ?= @MKDIR_P@
 RM        ?= rm -f
 RM_REC    ?= $(RM) -r
 
+#################################################
+# General package configuration
+#################################################
+
+USDX_PACKAGE_NAME := @PACKAGE_NAME@
+USDX_VERSION := @PACKAGE_VERSION@
+USDX_TARNAME := @PACKAGE_TARNAME@
+
 #################################################
 # USDX Paths
 #################################################
@@ -36,6 +49,8 @@ USDX_TOOLS_DIR := $(top_srcdir)/tools
 USDX_BUILD_DIR := $(top_srcdir)/build
 USDX_LIB_DIR   := $(USDX_SRC_DIR)/lib
 
+INSTALL_DATADIR := $(datadir)/$(USDX_PACKAGE_NAME)
+
 #################################################
 # RC -> resource.inc
 #################################################
@@ -67,13 +82,54 @@ PCUNIT_FLAGS := -FU$(PCUNIT_DIR)
 # Directories added to the includes path
 PINC_FLAGS := -Fi$(USDX_LIB_DIR)/JEDI-SDL/SDL/Pas
 
-PFLAGS_BASE    ?= -S2gi -vB
-PFLAGS_EXTRA   ?= @PFLAGS_EXTRA@
+##
+# PFLAGS
+##
+
+# Defined on debug mode
+ENABLE_DEBUG := @ENABLE_DEBUG@
+
+# Note: 
+#   - PFLAGS/PFLAGS_* defaults to $(PFLAGS_XYZ_DEFAULT) if not set by the user
+#   - if PFLAGS is defined, PFLAGS_* will be ignored on "make all"
+PFLAGS         ?= @PFLAGS@
+PFLAGS_BASE    ?= @PFLAGS_BASE@
 PFLAGS_DEBUG   ?= @PFLAGS_DEBUG@
 PFLAGS_RELEASE ?= @PFLAGS_RELEASE@
-# user-flags (specified with configure) must be last in
-# list to overwrite defaults (e.g. the "-"-option: -Xs-).
-PFLAGS         ?= $(PFLAGS_BASE) @PFLAGS_MAKE@ $(PFLAGS_EXTRA)
+
+# Do not overwrite, just add extra flags
+PFLAGS_EXTRA   += @PFLAGS_EXTRA@
+
+# Default PFLAGS, used if PFLAGS/PFLAGS_* was not set by the user 
+# - Do not use -dDEBUG because it will enable unwanted features
+# - Do not strip executable (-Xs, set by fpc.cfg) to be GNU make conformant
+# - Use DEBUG_MODE instead of DEBUG to avoid enabling the fpc.cfg DEBUG preset
+# - The flag -vB appends the full path to filenames
+# - Note that fpc.cfg already defines -vinw, so add -v0 first
+# - The stack check (-Ct) might not work with enabled threading
+# - Do we need -Coi?
+PFLAGS_BASE_DEFAULT    := -Si -Sg- -Sc- -v0Binwe
+PFLAGS_DEBUG_DEFAULT   := -Xs- -g -gl -dDEBUG_MODE
+PFLAGS_RELEASE_DEFAULT := -Xs- -O2
+PFLAGS_EXTRA_DEFAULT   :=
+
+# Debug/Release mode flags
+# Note that flags will overwrite previously specified flags,
+# e.g. "-vinwe -vi-" is the same as "-vnwe"
+PFLAGS_DEBUG_ALL   := $(PFLAGS_BASE) $(PFLAGS_DEBUG) $(PFLAGS_EXTRA)
+PFLAGS_RELEASE_ALL := $(PFLAGS_BASE) $(PFLAGS_RELEASE) $(PFLAGS_EXTRA)
+
+# Choose default PFLAGS, depending on debug mode.
+# Only used if PFLAGS was not set by the user.
+ifdef ENABLE_DEBUG
+PFLAGS_DEFAULT := $(PFLAGS_DEBUG_ALL)
+else
+PFLAGS_DEFAULT := $(PFLAGS_RELEASE_ALL)
+endif
+
+###
+# linker and library settings
+###
 
 LIBS       ?= @LIBS@
 LDFLAGS    ?= @LDFLAGS@
@@ -82,6 +138,8 @@ ifneq ($(linkflags),)
 PLINKFLAGS := -k"$(linkflags)"
 endif
 
+PFLAGS_ALL = $(PFLAGS) $(PDEFINES) $(PLINKFLAGS) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS)
+
 #################################################
 # USDX project config
 #################################################
@@ -98,7 +156,7 @@ USDX_BIN := $(USDX_GAME_DIR)/$(USDX_BIN_NAME)
 
 PROJECTM_CWRAPPER_DIR := $(USDX_LIB_DIR)/projectM/cwrapper
 PROJECTM_CWRAPPER_LIB := $(PROJECTM_CWRAPPER_DIR)/libprojectM-cwrapper.a
-USE_PROJECTM_CWRAPPER = @USE_PROJECTM_CWRAPPER@
+USE_PROJECTM_CWRAPPER := @USE_PROJECTM_CWRAPPER@
 
 #################################################
 # Static libs
@@ -113,69 +171,76 @@ endif
 # general targets
 #################################################
 
-INC_FILES = $(shell find . -name "*.inc")
-PAS_FILES = $(shell find . -name "*.pas" -o -name "*.pp")
-BIN_DEPS = 
-
 .PHONY: all
-all: rebuild
-
-# one shot debug build
-.PHONY: debug
-debug: PFLAGS := $(PFLAGS_BASE) $(PFLAGS_DEBUG) $(PFLAGS_EXTRA)
-debug: rebuild
-
-# one shot release build
-.PHONY: release
-release: PFLAGS := $(PFLAGS_BASE) $(PFLAGS_RELEASE) $(PFLAGS_EXTRA)
-release: rebuild
-
-# build, but always clean old data before compiling.
-# FPC does not reliably recognize changes in .inc-files, static libs
-# (and maybe even conditional .pas) dependencies. This might result
-# in corrupted builds and renders debugging difficult.
-# Clean if any (%) file changed.
+all: build
+
+# One shot debug build (always rebuild)
+# Note: we cannot set PFLAGS and call build directly, 
+#  as target specific flags are not passed at recursive
+#  make calls. So call debug-build first.
+.PHONY: debug debug-build
+debug: clean_obj
+	$(MAKE) debug-build
+
+debug-build: PFLAGS := $(PFLAGS_DEBUG_ALL)
+debug-build: build
+
+# One shot release build (always rebuild)
+# Note: we cannot set PFLAGS and call build directly, 
+#  as target specific flags are not passed at recursive
+#  make calls. So call release-build first.
+.PHONY: release release-build
+release: clean_obj
+	$(MAKE) release-build
+
+release-build: PFLAGS := $(PFLAGS_RELEASE_ALL)
+release-build: build
+
+# Always rebuild, even if no file changed.
 .PHONY: rebuild
-rebuild: CLEANON_PATTERN := %
-rebuild: $(USDX_BIN)
-
-# Use FPC to determine if the sources have to be rebuild.
-# This does not work if an .inc or a static lib (e.g. .a) changed so we will
-# manually clean in these cases. FPC might even miss some changes in 
-# .pas files so we prefer the rebuild target.
-# Clean if an inc-file (%.inc) or static lib (%.a) changed.
+rebuild: clean_obj
+	$(MAKE) build
+
+# Build if files changed. Always clean old data before compiling.
+# FPC does not reliably recognize changes, neither in .pas, 
+# .inc-files nor static libs (.a/.o). This might result in corrupted 
+# builds and renders debugging difficult (because FPC uses outdated
+# .ppu/.o data of files that have been changed).
 .PHONY: build
-build: CLEANON_PATTERN := %.inc %.a
 build: $(USDX_BIN)
 
 #################################################
 # build
 #################################################
 
-# After expansion of the expression, check_clean will
-# contain the first changed prerequisite ($?) that matches
-# CLEANON_PATTERN. It is used to check if any prerequisite of CLEANON_PATTERN
-# type changed (we just return the first word to avoid spaces in 
-# the result that might crash "test x$(check_clean)").
-check_clean = $(firstword $(filter $(CLEANON_PATTERN), $?))
+SRC_FILES = $(shell find $(srcdir) -name "*.inc" -o -name "*.pas" -o -name "*.pp")
+
+# To conform to the GNU Coding Standards, INSTALL_DATADIR is
+# not hardcoded so $prefix and $datadir can be changed at any
+# execution of this Makefile. 
+# Paths cannot be passed to fpc via -d as with gcc's -D parameter.
+# We use an intermediate file instead.
+# See [info autoconf], "19.5 How Do I `#define' Installation Directories?"
+.PHONY: paths.inc
+paths.inc:
+	echo "INSTALL_DATADIR = '$(INSTALL_DATADIR)';" >$@
 
-$(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(INC_FILES) $(PAS_FILES)
+# check if any src-file changed and rebuild
+$(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(INC_FILES) $(PAS_FILES) paths.inc
 	@echo "==================================="
 	@echo "Changed files:"
 	@echo "$?"
 	@echo "==================================="
+	@echo "-----------------------------------"
+	@echo "Clean old object data..."
+
+	$(MAKE) clean_obj
 
-# Checks if a rebuild is required.
-# This is the case if any file matching $CLEANON_PATTERN changed.
-	@if test x$(check_clean) != x; then \
-	  echo "-----------------------------------"; \
-	  echo "Clean objects..."; \
-	  $(MAKE) clean_obj; \
-	  echo "-----------------------------------"; \
-	fi
+	@echo "-----------------------------------"
 
 	$(MKDIR) "$(PCUNIT_DIR)"
-	$(PPC) $(strip $(PFLAGS) $(PDEFINES) $(PLINKFLAGS) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS)) -o$@ $(USDX_PROJ)
+	$(MAKE) paths.inc
+	$(PPC) $(strip $(PFLAGS_ALL)) -o$@ $(USDX_PROJ)
 
 #################################################
 # Resource-file
@@ -191,6 +256,7 @@ $(RESOURCE_FILE): $(RC_FILE)
 
 .PHONY: clean
 clean: clean_obj clean_res
+	$(RM) paths.inc
 
 .PHONY: clean_res
 clean_res:
@@ -199,7 +265,6 @@ clean_res:
 .PHONY: clean_obj
 clean_obj: clean_bin
 	$(RM_REC) "$(PCUNIT_DIR)"
-	-rmdir "$(USDX_BUILD_DIR)"
 
 .PHONY: clean_bin
 clean_bin:
-- 
cgit v1.2.3


From d6554ccc1ec223c52f33ff034491e64ac1fa92aa Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 9 Sep 2008 21:28:44 +0000
Subject: FreeBSD compatibility fixes: - libpng -> libpng12 - arithmetic
 expressions with no argument do not work $(()) -> check for empty
 minor/major/release version added (error occurred with portaudio. The version
 is simply 19) - duplicates in linker flags removed (-L...)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1356 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index 534fe73f..110d3fec 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -133,7 +133,7 @@ endif
 
 LIBS       ?= @LIBS@
 LDFLAGS    ?= @LDFLAGS@
-linkflags  := $(strip $(LDFLAGS) $(LIBS))
+linkflags  := $(sort $(LDFLAGS) $(LIBS))
 ifneq ($(linkflags),)
 PLINKFLAGS := -k"$(linkflags)"
 endif
-- 
cgit v1.2.3


From 2f7a8bf9f354b9eed47ed365efc44c0df08cd18e Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 11 Sep 2008 10:24:12 +0000
Subject: small change of paths.inc target

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1362 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index 110d3fec..33bf8fba 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -220,13 +220,17 @@ SRC_FILES = $(shell find $(srcdir) -name "*.inc" -o -name "*.pas" -o -name "*.pp
 # execution of this Makefile. 
 # Paths cannot be passed to fpc via -d as with gcc's -D parameter.
 # We use an intermediate file instead.
+#
 # See [info autoconf], "19.5 How Do I `#define' Installation Directories?"
-.PHONY: paths.inc
-paths.inc:
-	echo "INSTALL_DATADIR = '$(INSTALL_DATADIR)';" >$@
+#
+# Do NOT use paths.inc as target name as it is in the requisite list
+# of $(USDX_BIN).
+.PHONY: create-pathinfo
+create-pathinfo:
+	echo "INSTALL_DATADIR = '$(INSTALL_DATADIR)';" > paths.inc
 
 # check if any src-file changed and rebuild
-$(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(INC_FILES) $(PAS_FILES) paths.inc
+$(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(SRC_FILES)
 	@echo "==================================="
 	@echo "Changed files:"
 	@echo "$?"
@@ -239,7 +243,7 @@ $(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(INC_FILES) $(PAS_FIL
 	@echo "-----------------------------------"
 
 	$(MKDIR) "$(PCUNIT_DIR)"
-	$(MAKE) paths.inc
+	$(MAKE) create-pathinfo
 	$(PPC) $(strip $(PFLAGS_ALL)) -o$@ $(USDX_PROJ)
 
 #################################################
-- 
cgit v1.2.3


From abf47ddd1fe77287136535e2d05ada48b99b8e1f Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 12 Sep 2008 09:51:33 +0000
Subject: - Windows resources (.rc) reduced to the icon - Texture resource
 names are now directly written to resources.inc - Fonts are no resources
 anymore. They are moved to game/fonts and can be changed to support multiple
 charsets (until the TTF part is finished). Fonts are registered in
 fonts/fonts.in

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1367 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index 33bf8fba..3d4b6def 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -51,17 +51,6 @@ USDX_LIB_DIR   := $(USDX_SRC_DIR)/lib
 
 INSTALL_DATADIR := $(datadir)/$(USDX_PACKAGE_NAME)
 
-#################################################
-# RC -> resource.inc
-#################################################
-
-# RC resource extraction config
-RESEXTRACTOR_DIR := $(USDX_TOOLS_DIR)/ResourceExtractor
-RESEXTRACTOR_BIN := $(RESEXTRACTOR_DIR)/ResourceExtractor$(EXEEXT)
-RESOURCE_DIR  := $(USDX_GAME_DIR)/resources
-RESOURCE_FILE := $(srcdir)/resource.inc
-RC_FILE       := $(srcdir)/ultrastardx.rc
-
 #################################################
 # FPC config
 #################################################
@@ -230,7 +219,7 @@ create-pathinfo:
 	echo "INSTALL_DATADIR = '$(INSTALL_DATADIR)';" > paths.inc
 
 # check if any src-file changed and rebuild
-$(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(SRC_FILES)
+$(USDX_BIN): $(USDX_PROJ) $(STATIC_LIBS) $(SRC_FILES)
 	@echo "==================================="
 	@echo "Changed files:"
 	@echo "$?"
@@ -246,26 +235,14 @@ $(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(SRC_FILES)
 	$(MAKE) create-pathinfo
 	$(PPC) $(strip $(PFLAGS_ALL)) -o$@ $(USDX_PROJ)
 
-#################################################
-# Resource-file
-#################################################
-
-$(RESOURCE_FILE): $(RC_FILE)
-	$(RESEXTRACTOR_BIN) $(RC_FILE) $(RESOURCE_DIR) $(RESOURCE_FILE)
-
-
 #################################################
 # clean-up
 #################################################
 
 .PHONY: clean
-clean: clean_obj clean_res
+clean: clean_obj
 	$(RM) paths.inc
 
-.PHONY: clean_res
-clean_res:
-	$(RM) "$(RESOURCE_FILE)"
-
 .PHONY: clean_obj
 clean_obj: clean_bin
 	$(RM_REC) "$(PCUNIT_DIR)"
-- 
cgit v1.2.3


From bb8a10d416366fa016ca48831d1e709a0ad26eb1 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 6 Jun 2009 21:47:46 +0000
Subject: -Cg added to the options in order to get PIC code for the plugins.
 Remember to do a ./configure

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1802 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index 3d4b6def..b98cf054 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -97,7 +97,7 @@ PFLAGS_EXTRA   += @PFLAGS_EXTRA@
 # - Note that fpc.cfg already defines -vinw, so add -v0 first
 # - The stack check (-Ct) might not work with enabled threading
 # - Do we need -Coi?
-PFLAGS_BASE_DEFAULT    := -Si -Sg- -Sc- -v0Binwe
+PFLAGS_BASE_DEFAULT    := -Si -Sg- -Sc- -Cg -v0Binwe
 PFLAGS_DEBUG_DEFAULT   := -Xs- -g -gl -dDEBUG_MODE
 PFLAGS_RELEASE_DEFAULT := -Xs- -O2
 PFLAGS_EXTRA_DEFAULT   :=
-- 
cgit v1.2.3


From 2277ef39712b0e2e08631960cd873159dd7c3ce8 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 10 Jun 2009 11:12:58 +0000
Subject: remove -Cg flag, because of problems with 32 bit Ubuntu. problems
 building the plugins cannot be resolved in this way.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1808 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index b98cf054..3d4b6def 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -97,7 +97,7 @@ PFLAGS_EXTRA   += @PFLAGS_EXTRA@
 # - Note that fpc.cfg already defines -vinw, so add -v0 first
 # - The stack check (-Ct) might not work with enabled threading
 # - Do we need -Coi?
-PFLAGS_BASE_DEFAULT    := -Si -Sg- -Sc- -Cg -v0Binwe
+PFLAGS_BASE_DEFAULT    := -Si -Sg- -Sc- -v0Binwe
 PFLAGS_DEBUG_DEFAULT   := -Xs- -g -gl -dDEBUG_MODE
 PFLAGS_RELEASE_DEFAULT := -Xs- -O2
 PFLAGS_EXTRA_DEFAULT   :=
-- 
cgit v1.2.3


From 917901e8e33438c425aef50a0a7417f32d77b760 Mon Sep 17 00:00:00 2001
From: s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 9 Nov 2009 00:27:55 +0000
Subject: merged unicode branch (r1931) into trunk

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1939 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index 3d4b6def..06e62c43 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -122,7 +122,7 @@ endif
 
 LIBS       ?= @LIBS@
 LDFLAGS    ?= @LDFLAGS@
-linkflags  := $(sort $(LDFLAGS) $(LIBS))
+linkflags  := -L/usr/lib $(sort $(LDFLAGS) $(LIBS))
 ifneq ($(linkflags),)
 PLINKFLAGS := -k"$(linkflags)"
 endif
-- 
cgit v1.2.3


From 7f37a7a60dec8ee0aa18d794b5789cc555da6036 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 13 Dec 2009 13:44:54 +0000
Subject: another fix to pass better options to the linker on Mac OS X, in
 particular to 10.4 ppc systems :-)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2028 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index 06e62c43..6e221af9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -122,7 +122,7 @@ endif
 
 LIBS       ?= @LIBS@
 LDFLAGS    ?= @LDFLAGS@
-linkflags  := -L/usr/lib $(sort $(LDFLAGS) $(LIBS))
+linkflags  := -L/usr/lib $(LDFLAGS) $(sort $(LIBS))
 ifneq ($(linkflags),)
 PLINKFLAGS := -k"$(linkflags)"
 endif
-- 
cgit v1.2.3