From 1ba91d5a0e1df7419a561f6dcf16a0839509a5e7 Mon Sep 17 00:00:00 2001 From: k-m_schindler 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/config.inc.in | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 src/config.inc.in (limited to 'src/config.inc.in') diff --git a/src/config.inc.in b/src/config.inc.in new file mode 100644 index 00000000..6bdf26b5 --- /dev/null +++ b/src/config.inc.in @@ -0,0 +1,58 @@ +{***************************************************************** + * Configuration file for @PACKAGE_STRING@ + * @configure_input@ + *****************************************************************} + +{* Paths *} + +{$@DEFINE_USE_LOCAL_DIRS@ UseLocalDirs} +{$IF (not Defined(UseLocalDirs)) and Defined(IncludeConstants)} + PathSuffix = WideString('@suffix@'); + SharedPath = WideString('@sharerootdir@/'+PathSuffix); +{$IFEND} + +{* Libraries *} + +{$@DEFINE_HAVE_FFMPEG@ HaveFFmpeg} +{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)} + av__codec = 'libavcodec'; + LIBAVCODEC_VERSION_MAJOR = @libavcodec_VERSION_MAJOR@; + LIBAVCODEC_VERSION_MINOR = @libavcodec_VERSION_MINOR@; + LIBAVCODEC_VERSION_RELEASE = @libavcodec_VERSION_RELEASE@; + + av__format = 'libavformat'; + LIBAVFORMAT_VERSION_MAJOR = @libavformat_VERSION_MAJOR@; + LIBAVFORMAT_VERSION_MINOR = @libavformat_VERSION_MINOR@; + LIBAVFORMAT_VERSION_RELEASE = @libavformat_VERSION_RELEASE@; + + av__util = 'libavutil'; + LIBAVUTIL_VERSION_MAJOR = @libavutil_VERSION_MAJOR@; + LIBAVUTIL_VERSION_MINOR = @libavutil_VERSION_MINOR@; + LIBAVUTIL_VERSION_RELEASE = @libavutil_VERSION_RELEASE@; +{$IFEND} + +{$@DEFINE_HAVE_SWSCALE@ HaveSWScale} +{$IF Defined(HaveSWScale) and Defined(IncludeConstants)} + sw__scale = 'libswscale'; + LIBSWSCALE_VERSION_MAJOR = @libswscale_VERSION_MAJOR@; + LIBSWSCALE_VERSION_MINOR = @libswscale_VERSION_MINOR@; + LIBSWSCALE_VERSION_RELEASE = @libswscale_VERSION_RELEASE@; +{$IFEND} + +{$@DEFINE_HAVE_PROJECTM@ HaveProjectM} +{$IF Defined(HaveProjectM) and Defined(IncludeConstants)} + ProjectM_DataDir = '@libprojectM_DATADIR@'; + PROJECTM_VERSION_MAJOR = @libprojectM_VERSION_MAJOR@; + PROJECTM_VERSION_MINOR = @libprojectM_VERSION_MINOR@; + PROJECTM_VERSION_RELEASE = @libprojectM_VERSION_RELEASE@; +{$IFEND} + +{$@DEFINE_HAVE_PORTAUDIO@ HavePortaudio} +{$IF Defined(HavePortaudio) and Defined(IncludeConstants)} + PORTAUDIO_VERSION_MAJOR = @portaudio_VERSION_MAJOR@; + PORTAUDIO_VERSION_MINOR = @portaudio_VERSION_MINOR@; + PORTAUDIO_VERSION_RELEASE = @portaudio_VERSION_RELEASE@; +{$IFEND} + +{$@DEFINE_HAVE_PORTMIXER@ HavePortmixer} + -- cgit v1.2.3 From fded3a5ed753bd0fff77fb73ab9abcd8ad715e59 Mon Sep 17 00:00:00 2001 From: tobigun Date: Mon, 1 Sep 2008 23:46:53 +0000 Subject: - suffix configure option removed git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1337 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/config.inc.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/config.inc.in') diff --git a/src/config.inc.in b/src/config.inc.in index 6bdf26b5..a9714366 100644 --- a/src/config.inc.in +++ b/src/config.inc.in @@ -7,8 +7,7 @@ {$@DEFINE_USE_LOCAL_DIRS@ UseLocalDirs} {$IF (not Defined(UseLocalDirs)) and Defined(IncludeConstants)} - PathSuffix = WideString('@suffix@'); - SharedPath = WideString('@sharerootdir@/'+PathSuffix); + INSTALL_DATADIR = '@INSTALL_DATADIR@'; {$IFEND} {* Libraries *} -- cgit v1.2.3 From 4859734e7e6699e5c88added2df53ba3ff168300 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 2 Sep 2008 13:34:19 +0000 Subject: - removed configure options --enable-local/global - instead for - global build: just type "make" and "make install" - local build: just type "make" and start "game/ultrastardx" git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1338 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/config.inc.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/config.inc.in') diff --git a/src/config.inc.in b/src/config.inc.in index a9714366..870c35fd 100644 --- a/src/config.inc.in +++ b/src/config.inc.in @@ -5,10 +5,9 @@ {* Paths *} -{$@DEFINE_USE_LOCAL_DIRS@ UseLocalDirs} -{$IF (not Defined(UseLocalDirs)) and Defined(IncludeConstants)} +{$IFDEF IncludeConstants} INSTALL_DATADIR = '@INSTALL_DATADIR@'; -{$IFEND} +{$ENDIF} {* Libraries *} -- cgit v1.2.3 From 5e1dd23ad5ed2fe8b0a618a9f9e10eac1694fe2b Mon Sep 17 00:00:00 2001 From: tobigun 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/config.inc.in | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/config.inc.in') diff --git a/src/config.inc.in b/src/config.inc.in index 870c35fd..004f8413 100644 --- a/src/config.inc.in +++ b/src/config.inc.in @@ -3,12 +3,6 @@ * @configure_input@ *****************************************************************} -{* Paths *} - -{$IFDEF IncludeConstants} - INSTALL_DATADIR = '@INSTALL_DATADIR@'; -{$ENDIF} - {* Libraries *} {$@DEFINE_HAVE_FFMPEG@ HaveFFmpeg} -- cgit v1.2.3 From e404ff79067fcde24150f42c2dcb926ec5926fd1 Mon Sep 17 00:00:00 2001 From: s_alexander Date: Wed, 13 Jan 2010 20:33:19 +0000 Subject: change lua lib filename for different versions git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2088 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/config.inc.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/config.inc.in') diff --git a/src/config.inc.in b/src/config.inc.in index 004f8413..b5e086f4 100644 --- a/src/config.inc.in +++ b/src/config.inc.in @@ -5,6 +5,10 @@ {* Libraries *} +{$IF Defined(IncludeConstants)} + lua_lib_name = '@lua_LIB_NAME@'; +{$IFEND} + {$@DEFINE_HAVE_FFMPEG@ HaveFFmpeg} {$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)} av__codec = 'libavcodec'; @@ -47,4 +51,3 @@ {$IFEND} {$@DEFINE_HAVE_PORTMIXER@ HavePortmixer} - -- cgit v1.2.3 From be3978a078196c423d1974d87bd3cf07a3dd2d45 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Mon, 24 May 2010 18:59:38 +0000 Subject: add configure for libpcre and add path for dlopen on darwin git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2416 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/config.inc.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/config.inc.in') diff --git a/src/config.inc.in b/src/config.inc.in index b5e086f4..d57c7ab4 100644 --- a/src/config.inc.in +++ b/src/config.inc.in @@ -50,4 +50,9 @@ PORTAUDIO_VERSION_RELEASE = @portaudio_VERSION_RELEASE@; {$IFEND} +{$@DEFINE_HAVE_LIBPCRE@ HaveLibPcre} +{$IF Defined(HaveLibPcre) and Defined(IncludeConstants)} + LIBPCRE_LIBDIR = '@libpcre_LIBDIR@'; +{$IFEND} + {$@DEFINE_HAVE_PORTMIXER@ HavePortmixer} -- cgit v1.2.3