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-win.inc | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/config-win.inc (limited to 'src/config-win.inc') diff --git a/src/config-win.inc b/src/config-win.inc new file mode 100644 index 00000000..e3ca8840 --- /dev/null +++ b/src/config-win.inc @@ -0,0 +1,56 @@ +{***************************************************************** + * Configuration file for UltraStar Deluxe 1.1 + *****************************************************************} + +{* Libraries *} + +{$DEFINE HaveFFmpeg} +{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)} + av__codec = 'avcodec-51'; + LIBAVCODEC_VERSION_MAJOR = 51; + LIBAVCODEC_VERSION_MINOR = 16; + LIBAVCODEC_VERSION_RELEASE = 0; + + av__format = 'avformat-50'; + LIBAVFORMAT_VERSION_MAJOR = 50; + LIBAVFORMAT_VERSION_MINOR = 5; + LIBAVFORMAT_VERSION_RELEASE = 0; + + av__util = 'avutil-49'; + LIBAVUTIL_VERSION_MAJOR = 49; + LIBAVUTIL_VERSION_MINOR = 0; + LIBAVUTIL_VERSION_RELEASE = 1; +{$IFEND} + +{$UNDEF HaveSWScale} +{$IF Defined(HaveSWScale) and Defined(IncludeConstants)} + sw__scale = 'swscale-0'; + LIBSWSCALE_VERSION_MAJOR = 0; + LIBSWSCALE_VERSION_MINOR = 5; + LIBSWSCALE_VERSION_RELEASE = 0; +{$IFEND} + +{$DEFINE HaveProjectM} +{$IF Defined(HaveProjectM) and Defined(IncludeConstants)} + ProjectM_DataDir = 'Visuals\projectM'; + PROJECTM_VERSION_MAJOR = 1; + PROJECTM_VERSION_MINOR = 10; + PROJECTM_VERSION_RELEASE = 0; +{$IFEND} + +{$UNDEF HavePortaudio} +{$IF Defined(HavePortaudio) and Defined(IncludeConstants)} + PORTAUDIO_VERSION_MAJOR = 19; + PORTAUDIO_VERSION_MINOR = 0; + PORTAUDIO_VERSION_RELEASE = 0; +{$IFEND} + +{$UNDEF HavePortmixer} + +{$UNDEF HaveLibsamplerate} +{$IF Defined(HaveLibsamplerate) and Defined(IncludeConstants)} + LIBSAMPLERATE_VERSION_MAJOR = 0; + LIBSAMPLERATE_VERSION_MINOR = 1; + LIBSAMPLERATE_VERSION_RELEASE = 3; +{$IFEND} + -- cgit v1.2.3 From 067a9f3484d6abae175453acb28bd556e0f570a4 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Tue, 12 Jan 2010 18:28:54 +0000 Subject: updated ffmpeg lib versions used by windows build to ffmpeg builds from 04 Jan 2010 activated use of swscale on windows versions are now: libavcodec 52.45.0 libavformat 52.46.0 libavutil 50.7.0 libswscale 0.7.2 You may use the precompiled builds from Jan 04th from the following url: http://ffmpeg.arrozcru.org/autobuilds/ffmpeg/mingw32/shared/ git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2072 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/config-win.inc | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'src/config-win.inc') diff --git a/src/config-win.inc b/src/config-win.inc index e3ca8840..72e00aef 100644 --- a/src/config-win.inc +++ b/src/config-win.inc @@ -1,4 +1,4 @@ -{***************************************************************** +{***************************************************************** * Configuration file for UltraStar Deluxe 1.1 *****************************************************************} @@ -6,28 +6,28 @@ {$DEFINE HaveFFmpeg} {$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)} - av__codec = 'avcodec-51'; - LIBAVCODEC_VERSION_MAJOR = 51; - LIBAVCODEC_VERSION_MINOR = 16; + av__codec = 'avcodec-52'; + LIBAVCODEC_VERSION_MAJOR = 52; + LIBAVCODEC_VERSION_MINOR = 45; LIBAVCODEC_VERSION_RELEASE = 0; - av__format = 'avformat-50'; - LIBAVFORMAT_VERSION_MAJOR = 50; - LIBAVFORMAT_VERSION_MINOR = 5; + av__format = 'avformat-52'; + LIBAVFORMAT_VERSION_MAJOR = 52; + LIBAVFORMAT_VERSION_MINOR = 46; LIBAVFORMAT_VERSION_RELEASE = 0; - av__util = 'avutil-49'; - LIBAVUTIL_VERSION_MAJOR = 49; - LIBAVUTIL_VERSION_MINOR = 0; - LIBAVUTIL_VERSION_RELEASE = 1; + av__util = 'avutil-50'; + LIBAVUTIL_VERSION_MAJOR = 50; + LIBAVUTIL_VERSION_MINOR = 7; + LIBAVUTIL_VERSION_RELEASE = 0; {$IFEND} -{$UNDEF HaveSWScale} +{$DEFINE HaveSWScale} {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} sw__scale = 'swscale-0'; LIBSWSCALE_VERSION_MAJOR = 0; - LIBSWSCALE_VERSION_MINOR = 5; - LIBSWSCALE_VERSION_RELEASE = 0; + LIBSWSCALE_VERSION_MINOR = 7; + LIBSWSCALE_VERSION_RELEASE = 2; {$IFEND} {$DEFINE HaveProjectM} @@ -53,4 +53,3 @@ LIBSAMPLERATE_VERSION_MINOR = 1; LIBSAMPLERATE_VERSION_RELEASE = 3; {$IFEND} - -- cgit v1.2.3 From c55bc6de5d68017431ac7dfb7fd3b77cf907eba0 Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Thu, 10 Jun 2010 18:38:47 +0000 Subject: update of ffmpeg lib versions in config-win libavcodec 52.66.0 libavformat 52.61.0 libavutil 50.14.0 libswscale 0.10.0 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2476 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/config-win.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/config-win.inc') diff --git a/src/config-win.inc b/src/config-win.inc index 72e00aef..ed941101 100644 --- a/src/config-win.inc +++ b/src/config-win.inc @@ -8,17 +8,17 @@ {$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)} av__codec = 'avcodec-52'; LIBAVCODEC_VERSION_MAJOR = 52; - LIBAVCODEC_VERSION_MINOR = 45; + LIBAVCODEC_VERSION_MINOR = 66; LIBAVCODEC_VERSION_RELEASE = 0; av__format = 'avformat-52'; LIBAVFORMAT_VERSION_MAJOR = 52; - LIBAVFORMAT_VERSION_MINOR = 46; + LIBAVFORMAT_VERSION_MINOR = 61; LIBAVFORMAT_VERSION_RELEASE = 0; av__util = 'avutil-50'; LIBAVUTIL_VERSION_MAJOR = 50; - LIBAVUTIL_VERSION_MINOR = 7; + LIBAVUTIL_VERSION_MINOR = 14; LIBAVUTIL_VERSION_RELEASE = 0; {$IFEND} @@ -26,8 +26,8 @@ {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} sw__scale = 'swscale-0'; LIBSWSCALE_VERSION_MAJOR = 0; - LIBSWSCALE_VERSION_MINOR = 7; - LIBSWSCALE_VERSION_RELEASE = 2; + LIBSWSCALE_VERSION_MINOR = 10; + LIBSWSCALE_VERSION_RELEASE = 0; {$IFEND} {$DEFINE HaveProjectM} -- cgit v1.2.3 From 6c84b3d8d0a2b7e22da74a7680c1d8854f5daf7a Mon Sep 17 00:00:00 2001 From: canni0 Date: Sun, 13 Jun 2010 10:34:04 +0000 Subject: - updated windows configuration file to fit changes through an update of ffmpeg to fix the black preview bug after seeking mpeg files introduced with the new video preview feature git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2513 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/config-win.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/config-win.inc') diff --git a/src/config-win.inc b/src/config-win.inc index ed941101..843fdb0e 100644 --- a/src/config-win.inc +++ b/src/config-win.inc @@ -8,18 +8,18 @@ {$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)} av__codec = 'avcodec-52'; LIBAVCODEC_VERSION_MAJOR = 52; - LIBAVCODEC_VERSION_MINOR = 66; - LIBAVCODEC_VERSION_RELEASE = 0; + LIBAVCODEC_VERSION_MINOR = 67; + LIBAVCODEC_VERSION_RELEASE = 2; av__format = 'avformat-52'; LIBAVFORMAT_VERSION_MAJOR = 52; - LIBAVFORMAT_VERSION_MINOR = 61; + LIBAVFORMAT_VERSION_MINOR = 62; LIBAVFORMAT_VERSION_RELEASE = 0; av__util = 'avutil-50'; LIBAVUTIL_VERSION_MAJOR = 50; - LIBAVUTIL_VERSION_MINOR = 14; - LIBAVUTIL_VERSION_RELEASE = 0; + LIBAVUTIL_VERSION_MINOR = 15; + LIBAVUTIL_VERSION_RELEASE = 2; {$IFEND} {$DEFINE HaveSWScale} -- cgit v1.2.3