From b35a00ba936bc16180c2f18fb0089e80c05ee4a8 Mon Sep 17 00:00:00 2001 From: tobigun Date: Fri, 18 Jan 2008 17:59:54 +0000 Subject: Autoconf scripts for configure and make. Run "aclocal -I m4" and "autoconf" to create the configure script. I checked this in to test the configure script. Note: the generated Makefile is not supposed to work yet. Use the already checked in Makefile instead. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@796 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Makefile.in | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 Game/Code/Makefile.in (limited to 'Game/Code/Makefile.in') diff --git a/Game/Code/Makefile.in b/Game/Code/Makefile.in new file mode 100644 index 00000000..b702f8d6 --- /dev/null +++ b/Game/Code/Makefile.in @@ -0,0 +1,141 @@ +## +# Makefile for @PACKAGE_NAME@ @PACKAGE_VERSION@ +# @PACKAGE_BUGREPORT@ +## + +# general definitions +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +libdir = @libdir@ +infodir = @infodir@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +datarootdir = @datarootdir@ + +# install tool +INSTALL = @INSTALL@ +# calls "ln -s" +LN_S = @LN_S@ + +USDX_PREFIX = UltraStar +USDX_TOOLS_DIR = ../../Tools + +EXE_SUFFIX = @EXEEXT@ + +# Free Pascal compiler +PPC = @PPC@ +PFLAGS = @PFLAGS@ +# FPC target platform and processor +PPLATFORM = @FPC_PLATFORM@ +PPROCESSOR = @FPC_PROCESSOR@ + +# lazarus defines +LAZARUS_DIR = @LAZARUS_DIR@ +PROJ_SUFFIX = .lpr + +# RC to LRS resource compiler +RESCOMPILER_NAME = USDXResCompiler +RESCOMPILER_BIN = $(USDX_TOOLS_DIR)/$(RESCOMPILER_NAME)$(EXE_SUFFIX) +RESCOMPILER_SRC = $(USDX_TOOLS_DIR)/$(RESCOMPILER_NAME)$(PROJ_SUFFIX) +RESCOMPILER_PFLAGS = -dRELEASE + +RES_SUFFIX = .lrs + +# Directories added to the unit path +PUNIT_TOKEN = -Fu +PUNIT_FLAGS = $(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM) \ + $(PUNIT_TOKEN)$(LAZARUS_DIR)/components/images/lib/$(PPROCESSOR)-$(PPLATFORM) \ + $(PUNIT_TOKEN)$(LAZARUS_DIR)/components/jpeg \ + $(PUNIT_TOKEN). + +# Directory where compiled units (.ppu and .o files) are stored +PCUNIT_TOKEN = -FU +PCUNIT_DIR = ./build/$(PPLATFORM)/lazarus +PCUNIT_FLAGS = $(PCUNIT_TOKEN)$(PCUNIT_DIR) + +# Directories added to the includes path +PINC_TOKEN = -Fi +PINC_FLAGS = $(PINC_TOKEN)lib/JEDI-SDLv1.0/SDL/Pas + +# Defines +PDEFINES = -dLCL + +# Misc fpc options +PCOMPAT_FLAGS = -S2dgi +#PCOMPAT_FLAGS += -Mdelphi +PVERBOSE_FLAGS = -vew -l +#PDEBUG_FLAGS = -g -gl +#PDEBUG_FLAGS = -dDEBUG +#POTHER_FLAGS = -Crtoi +#POPTIMIZE_FLAGS_FPC204 = -OG2p3 +#POPTIMIZE_FLAGS_FPC220 = -O2p"NAME" +#POPTIMIZE_FLAGS = -dRELEASE +#POPTIMIZE_FLAGS = -Xs +PFLAGS += $(PCOMPAT_FLAGS) \ + $(PVERBOSE_FLAGS) \ + $(PDEFINES) + +# lpr project file used as input +USDX_SRC = $(USDX_PREFIX)$(PROJ_SUFFIX) +# name of executable +USDX_BIN = $(USDX_PREFIX)$(EXE_SUFFIX) +# name of resource +USDX_RES = $(USDX_PREFIX)$(RES_SUFFIX) + +.PHONY: all resources ultrastar install uninstall clean distclean clean_obj clean_res + +all: resources ultrastar + +resources: $(USDX_RES) + +# we need to rebuild everything, fpc does some sort of caching of old files, +# so we have to delete all the old stuff first +ultrastar: clean_obj + mkdir -p $(PCUNIT_DIR) + $(PPC) $(PFLAGS) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS) -o$(USDX_BIN) $(USDX_SRC) + +install: all +# $()/mkinstalldirs $(bindir) +# $()/mkinstalldirs $(libdir) +# $()/mkinstalldirs $(infodir) + mv $(OUTPUT) ../.. +# $(INSTALL) $(USDX_BIN) $(bindir)/$(USDX_BIN) + +uninstall: +# rm -f ... + echo "Comming soon!" + +clean: clean_obj clean_res + +distclean: clean + find . -name "*.o" -o -name "*.ppu" -o -name "*.rst" | xargs rm -f + find . -name "*.bak" -o -name "*.orig" -o -name "*.dcu" | xargs rm -f + find . -name "__history" | xargs rm -r -f + rm -f $(OUTPUT).cfg $(OUTPUT).res $(OUTPUT).identcache + rm -f config.inc config.log config.status configure + +clean_obj: + find "$(PCUNIT_DIR)" -name "*.o" -o -name "*.ppu" -o -name "*.rst" | xargs rm -f + rm -f $(OUTPUT) + +clean_res: + rm -f $(USDX_RES) link.res + +$(USDX_RES): $(RESCOMPILER_BIN) $(USDX_PREFIX).rc + $(RESCOMPILER_BIN) $(USDX_PREFIX).rc + +$(RESCOMPILER_BIN): $(RESCOMPILER_SRC) + $(PPC) $(RESCOMPILER_PFLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS) -o$@ $(RESCOMPILER_SRC) + +configure: configure.ac aclocal.m4 + autoconf + +aclocal.m4: m4/* + aclocal -I m4 + +Makefile: Makefile.in config.status + ./config.status + +config.status: configure + ./config.status --recheck \ No newline at end of file -- cgit v1.2.3 From 250c2dc22419d2b2101bbb6d69aa5d52e2479a6e Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 5 Feb 2008 21:55:59 +0000 Subject: updated configure stuff git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@831 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Makefile.in | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'Game/Code/Makefile.in') diff --git a/Game/Code/Makefile.in b/Game/Code/Makefile.in index b702f8d6..5df6c737 100644 --- a/Game/Code/Makefile.in +++ b/Game/Code/Makefile.in @@ -1,5 +1,6 @@ ## # Makefile for @PACKAGE_NAME@ @PACKAGE_VERSION@ +# @AUTOCONF_INFO@ # @PACKAGE_BUGREPORT@ ## @@ -12,6 +13,7 @@ infodir = @infodir@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ datarootdir = @datarootdir@ +VPATH = @srcdir@ # install tool INSTALL = @INSTALL@ @@ -21,6 +23,8 @@ LN_S = @LN_S@ USDX_PREFIX = UltraStar USDX_TOOLS_DIR = ../../Tools + + EXE_SUFFIX = @EXEEXT@ # Free Pascal compiler @@ -83,26 +87,33 @@ USDX_BIN = $(USDX_PREFIX)$(EXE_SUFFIX) # name of resource USDX_RES = $(USDX_PREFIX)$(RES_SUFFIX) -.PHONY: all resources ultrastar install uninstall clean distclean clean_obj clean_res +.PHONY: all resources ultrastardx-app install uninstall clean distclean clean_obj clean_res -all: resources ultrastar +all: resources ultrastardx-app resources: $(USDX_RES) -# we need to rebuild everything, fpc does some sort of caching of old files, -# so we have to delete all the old stuff first -ultrastar: clean_obj +ultrastardx-app: $(USDX_BIN) + +# Clean and rebuild everything because FPC caches some old files +# (it uses an .inc-files cache for example). +# As a result FPC misses some changes if it is called without cleaning +# up first (very annoying while debugging). +$(USDX_BIN): + $(MAKE) clean_obj mkdir -p $(PCUNIT_DIR) $(PPC) $(PFLAGS) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS) -o$(USDX_BIN) $(USDX_SRC) install: all +# TODO: copy files to the appropriate places # $()/mkinstalldirs $(bindir) # $()/mkinstalldirs $(libdir) # $()/mkinstalldirs $(infodir) - mv $(OUTPUT) ../.. + mv $(USDX_BIN) ../.. # $(INSTALL) $(USDX_BIN) $(bindir)/$(USDX_BIN) uninstall: +# TODO: remove installed files # rm -f ... echo "Comming soon!" @@ -116,7 +127,7 @@ distclean: clean rm -f config.inc config.log config.status configure clean_obj: - find "$(PCUNIT_DIR)" -name "*.o" -o -name "*.ppu" -o -name "*.rst" | xargs rm -f + find "$(PCUNIT_DIR)" -name "*.o" -o -name "*.ppu" -o -name "*.rst" -o -name "*.compiled" | xargs rm -f rm -f $(OUTPUT) clean_res: @@ -128,7 +139,7 @@ $(USDX_RES): $(RESCOMPILER_BIN) $(USDX_PREFIX).rc $(RESCOMPILER_BIN): $(RESCOMPILER_SRC) $(PPC) $(RESCOMPILER_PFLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS) -o$@ $(RESCOMPILER_SRC) -configure: configure.ac aclocal.m4 +configure: configure.ac config.inc.in aclocal.m4 autoconf aclocal.m4: m4/* @@ -138,4 +149,4 @@ Makefile: Makefile.in config.status ./config.status config.status: configure - ./config.status --recheck \ No newline at end of file + ./config.status --recheck -- cgit v1.2.3 From f0b4ae82ddbd384c7dad594eb36d14e4946a5f62 Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 7 Feb 2008 19:59:24 +0000 Subject: made some adaptions to be more portable. you might have to call "autogen.sh" again because i added a new m4 script with one of the last commits. call "./configure --enable-dev-build" after this to install USDX into the local directory (the binary will simply be moved to ../.. at the moment). git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@840 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Makefile.in | 82 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 32 deletions(-) (limited to 'Game/Code/Makefile.in') diff --git a/Game/Code/Makefile.in b/Game/Code/Makefile.in index 5df6c737..b4eff25d 100644 --- a/Game/Code/Makefile.in +++ b/Game/Code/Makefile.in @@ -1,7 +1,6 @@ ## # Makefile for @PACKAGE_NAME@ @PACKAGE_VERSION@ -# @AUTOCONF_INFO@ -# @PACKAGE_BUGREPORT@ +# @configure_input@ ## # general definitions @@ -23,19 +22,19 @@ LN_S = @LN_S@ USDX_PREFIX = UltraStar USDX_TOOLS_DIR = ../../Tools - - EXE_SUFFIX = @EXEEXT@ # Free Pascal compiler PPC = @PPC@ PFLAGS = @PFLAGS@ +PLIBS = @PLIBS@ # FPC target platform and processor PPLATFORM = @FPC_PLATFORM@ PPROCESSOR = @FPC_PROCESSOR@ # lazarus defines LAZARUS_DIR = @LAZARUS_DIR@ +LCL_WIDGET_TYPE = @LCL_WIDGET_TYPE@ PROJ_SUFFIX = .lpr # RC to LRS resource compiler @@ -44,14 +43,14 @@ RESCOMPILER_BIN = $(USDX_TOOLS_DIR)/$(RESCOMPILER_NAME)$(EXE_SUFFIX) RESCOMPILER_SRC = $(USDX_TOOLS_DIR)/$(RESCOMPILER_NAME)$(PROJ_SUFFIX) RESCOMPILER_PFLAGS = -dRELEASE -RES_SUFFIX = .lrs - # Directories added to the unit path PUNIT_TOKEN = -Fu -PUNIT_FLAGS = $(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM) \ - $(PUNIT_TOKEN)$(LAZARUS_DIR)/components/images/lib/$(PPROCESSOR)-$(PPLATFORM) \ - $(PUNIT_TOKEN)$(LAZARUS_DIR)/components/jpeg \ - $(PUNIT_TOKEN). +PUNIT_FLAGS = \ + $(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM) \ + $(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM)/$(LCL_WIDGET_TYPE) \ + $(PUNIT_TOKEN)$(LAZARUS_DIR)/components/images/lib/$(PPROCESSOR)-$(PPLATFORM) \ + $(PUNIT_TOKEN)$(LAZARUS_DIR)/components/jpeg \ + $(PUNIT_TOKEN). # Directory where compiled units (.ppu and .o files) are stored PCUNIT_TOKEN = -FU @@ -60,10 +59,10 @@ PCUNIT_FLAGS = $(PCUNIT_TOKEN)$(PCUNIT_DIR) # Directories added to the includes path PINC_TOKEN = -Fi -PINC_FLAGS = $(PINC_TOKEN)lib/JEDI-SDLv1.0/SDL/Pas +PINC_FLAGS = $(PINC_TOKEN)lib/JEDI-SDL/SDL/Pas # Defines -PDEFINES = -dLCL +PDEFINES = -dLCL -dLCL$(LCL_WIDGET_TYPE) # Misc fpc options PCOMPAT_FLAGS = -S2dgi @@ -84,14 +83,12 @@ PFLAGS += $(PCOMPAT_FLAGS) \ USDX_SRC = $(USDX_PREFIX)$(PROJ_SUFFIX) # name of executable USDX_BIN = $(USDX_PREFIX)$(EXE_SUFFIX) -# name of resource -USDX_RES = $(USDX_PREFIX)$(RES_SUFFIX) -.PHONY: all resources ultrastardx-app install uninstall clean distclean clean_obj clean_res +.PHONY: all resources ultrastardx-app install install-dev install-release uninstall uninstall-dev uninstall-release clean distclean clean_obj clean_res all: resources ultrastardx-app -resources: $(USDX_RES) +resources: $(USDX_PREFIX).lrs ultrastardx-app: $(USDX_BIN) @@ -99,44 +96,65 @@ ultrastardx-app: $(USDX_BIN) # (it uses an .inc-files cache for example). # As a result FPC misses some changes if it is called without cleaning # up first (very annoying while debugging). -$(USDX_BIN): - $(MAKE) clean_obj +$(USDX_BIN): clean_obj +# $(MAKE) clean_obj mkdir -p $(PCUNIT_DIR) - $(PPC) $(PFLAGS) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS) -o$(USDX_BIN) $(USDX_SRC) + $(PPC) $(PFLAGS) $(PLIBS) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS) -o$@ $(USDX_SRC) + +install: install-@install_type@ +# all + +uninstall: uninstall-@install_type@ + + +# local development build -install: all +install-dev: + mv $(USDX_BIN) ../.. + +uninstall-dev: + rm -f ../../$(USDX_BIN) + +# global release build + +install-release: # TODO: copy files to the appropriate places # $()/mkinstalldirs $(bindir) # $()/mkinstalldirs $(libdir) # $()/mkinstalldirs $(infodir) - mv $(USDX_BIN) ../.. # $(INSTALL) $(USDX_BIN) $(bindir)/$(USDX_BIN) + @echo '"install-release" does not exist yet. Install USDX yourself or use "./configure --enable-dev-build" for a local installation.' -uninstall: +uninstall-release: # TODO: remove installed files -# rm -f ... - echo "Comming soon!" +# rm -f xyz + @echo '"install-release" does not exist yet.' + -clean: clean_obj clean_res +clean: clean_obj -distclean: clean - find . -name "*.o" -o -name "*.ppu" -o -name "*.rst" | xargs rm -f - find . -name "*.bak" -o -name "*.orig" -o -name "*.dcu" | xargs rm -f +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 $(OUTPUT).cfg $(OUTPUT).res $(OUTPUT).identcache + rm -f $(USDX_PREFIX).res $(USDX_PREFIX).identcache rm -f config.inc config.log config.status configure + rm -f Makefile + rm -f aclocal.m4 + rm -rf autom4te.cache clean_obj: find "$(PCUNIT_DIR)" -name "*.o" -o -name "*.ppu" -o -name "*.rst" -o -name "*.compiled" | xargs rm -f - rm -f $(OUTPUT) + rm -f $(USDX_BIN) clean_res: - rm -f $(USDX_RES) link.res + rm -f $(USDX_PREFIX).lrs -$(USDX_RES): $(RESCOMPILER_BIN) $(USDX_PREFIX).rc +$(USDX_PREFIX).lrs: $(RESCOMPILER_BIN) $(USDX_PREFIX).rc $(RESCOMPILER_BIN) $(USDX_PREFIX).rc $(RESCOMPILER_BIN): $(RESCOMPILER_SRC) + mkdir -p $(PCUNIT_DIR) $(PPC) $(RESCOMPILER_PFLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS) -o$@ $(RESCOMPILER_SRC) configure: configure.ac config.inc.in aclocal.m4 -- cgit v1.2.3 From 4b221bce47a8d993de19dab49884c1c2f17014d4 Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 7 Feb 2008 21:50:25 +0000 Subject: - removed the gtk2 detection (it is just necessary if we want to use lazjpeg instead of Ulazjpeg) - undefined ProjectM in switches.inc because it caused some trouble (black screen or crashes). So you have to enable this if you want to use ProjectM. I will try to find the cause for the problem. It occurs with flms` installation only so we will have to debug his version remotely. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@841 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Makefile.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Game/Code/Makefile.in') diff --git a/Game/Code/Makefile.in b/Game/Code/Makefile.in index b4eff25d..6ab1902e 100644 --- a/Game/Code/Makefile.in +++ b/Game/Code/Makefile.in @@ -47,10 +47,10 @@ RESCOMPILER_PFLAGS = -dRELEASE PUNIT_TOKEN = -Fu PUNIT_FLAGS = \ $(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM) \ - $(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM)/$(LCL_WIDGET_TYPE) \ $(PUNIT_TOKEN)$(LAZARUS_DIR)/components/images/lib/$(PPROCESSOR)-$(PPLATFORM) \ $(PUNIT_TOKEN)$(LAZARUS_DIR)/components/jpeg \ $(PUNIT_TOKEN). +# $(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM)/$(LCL_WIDGET_TYPE) # Directory where compiled units (.ppu and .o files) are stored PCUNIT_TOKEN = -FU @@ -62,7 +62,8 @@ PINC_TOKEN = -Fi PINC_FLAGS = $(PINC_TOKEN)lib/JEDI-SDL/SDL/Pas # Defines -PDEFINES = -dLCL -dLCL$(LCL_WIDGET_TYPE) +PDEFINES = -dLCL +#-dLCL$(LCL_WIDGET_TYPE) # Misc fpc options PCOMPAT_FLAGS = -S2dgi -- cgit v1.2.3 From 64cc353a1bdcc0ef181dc8bd667ea30cd0cd191d Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 12 Feb 2008 10:35:06 +0000 Subject: Updated the autoconf/Makefile stuff - Use "./configue --enable-dev-build" to install locally - You can skip pkg-config errors with "--enable-skip-pkgconfig-errors" now git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@844 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Makefile.in | 62 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 21 deletions(-) (limited to 'Game/Code/Makefile.in') diff --git a/Game/Code/Makefile.in b/Game/Code/Makefile.in index 6ab1902e..defada7a 100644 --- a/Game/Code/Makefile.in +++ b/Game/Code/Makefile.in @@ -14,19 +14,20 @@ top_srcdir = @top_srcdir@ datarootdir = @datarootdir@ VPATH = @srcdir@ +usdxrootdir = ../.. + # install tool INSTALL = @INSTALL@ # calls "ln -s" LN_S = @LN_S@ USDX_PREFIX = UltraStar -USDX_TOOLS_DIR = ../../Tools +USDX_TOOLS_DIR = $(usdxrootdir)/Tools EXE_SUFFIX = @EXEEXT@ # Free Pascal compiler PPC = @PPC@ -PFLAGS = @PFLAGS@ PLIBS = @PLIBS@ # FPC target platform and processor PPLATFORM = @FPC_PLATFORM@ @@ -63,29 +64,33 @@ PINC_FLAGS = $(PINC_TOKEN)lib/JEDI-SDL/SDL/Pas # Defines PDEFINES = -dLCL +# this is necessary to use lazjpeg instead of Ulazjpeg +# but requires configure to detect if gtk/gkt2 or qt is used #-dLCL$(LCL_WIDGET_TYPE) -# Misc fpc options -PCOMPAT_FLAGS = -S2dgi -#PCOMPAT_FLAGS += -Mdelphi -PVERBOSE_FLAGS = -vew -l -#PDEBUG_FLAGS = -g -gl -#PDEBUG_FLAGS = -dDEBUG -#POTHER_FLAGS = -Crtoi -#POPTIMIZE_FLAGS_FPC204 = -OG2p3 -#POPTIMIZE_FLAGS_FPC220 = -O2p"NAME" -#POPTIMIZE_FLAGS = -dRELEASE -#POPTIMIZE_FLAGS = -Xs -PFLAGS += $(PCOMPAT_FLAGS) \ - $(PVERBOSE_FLAGS) \ - $(PDEFINES) +# FPC flags + +# The user can overwrite the default flags with +# make PFLAGS="myflags" +PFLAGS = -S2dgi +# 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@ + +PFLAGS_DEBUG = @PFLAGS_DEBUG@ +PFLAGS_RELEASE = @PFLAGS_RELEASE@ + +# The user can specify additional flags with +# make PFLAGS_EXTRA="myflags" +PFLAGS_EXTRA = +PFLAGS += $(PFLAGS_EXTRA) # lpr project file used as input USDX_SRC = $(USDX_PREFIX)$(PROJ_SUFFIX) # name of executable -USDX_BIN = $(USDX_PREFIX)$(EXE_SUFFIX) +USDX_BIN = $(usdxrootdir)/$(USDX_PREFIX)$(EXE_SUFFIX) -.PHONY: all resources ultrastardx-app install install-dev install-release uninstall uninstall-dev uninstall-release clean distclean clean_obj clean_res +.PHONY: all resources ultrastardx-app install install-dev install-release uninstall uninstall-dev uninstall-release clean distclean clean_obj clean_res fetch-sounds all: resources ultrastardx-app @@ -100,7 +105,7 @@ ultrastardx-app: $(USDX_BIN) $(USDX_BIN): clean_obj # $(MAKE) clean_obj mkdir -p $(PCUNIT_DIR) - $(PPC) $(PFLAGS) $(PLIBS) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS) -o$@ $(USDX_SRC) + $(PPC) $(PFLAGS) $(PDEFINES) $(PLIBS) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS) -o$@ $(USDX_SRC) install: install-@install_type@ # all @@ -111,10 +116,25 @@ uninstall: uninstall-@install_type@ # local development build install-dev: - mv $(USDX_BIN) ../.. + @if [ ! -d "$(usdxrootdir)/Visuals" ]; then \ + echo "Copying visualizer data to $(usdxrootdir)/Visuals ..."; \ + cp -r "$(usdxrootdir)/InstallerDependencies/Visuals" "$(usdxrootdir)"; \ + fi + @if [ ! -f "$(usdxrootdir)/Sounds/Common start.mp3" ]; then \ + echo ""; \ + echo "# The sound-files from Sound-directory of the 1.0.1-branch are required."; \ + echo "# Copy them yourself to \"$(usdxrootdir)/Sounds\""; \ + echo "# or if you are connected to the web try:"; \ + echo "# make fetch-sounds"; \ + fi + +fetch-sounds: + svn co https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/branches/1.0.1/Sounds tmp-sounds + mv tmp-sounds/*.mp3 $(usdxrootdir)/Sounds + rm -rf tmp-sounds uninstall-dev: - rm -f ../../$(USDX_BIN) + rm -f $(USDX_BIN) # global release build -- cgit v1.2.3