aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Classes
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-02-07 19:52:50 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-02-07 19:52:50 +0000
commitd4d3d8873fea024cd9e1f17b04416bebe627d1f0 (patch)
tree47053ef22d8de6a59326efe9bb0721ce0d698a30 /Game/Code/Classes
parent51a8b92b1696c8ff27523de753a7c6a743a817de (diff)
downloadusdx-d4d3d8873fea024cd9e1f17b04416bebe627d1f0.tar.gz
usdx-d4d3d8873fea024cd9e1f17b04416bebe627d1f0.tar.xz
usdx-d4d3d8873fea024cd9e1f17b04416bebe627d1f0.zip
SWScale will only be used if FFMpeg is available (this should be the standard case)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@839 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Code/Classes/UConfig.pas19
1 files changed, 15 insertions, 4 deletions
diff --git a/Game/Code/Classes/UConfig.pas b/Game/Code/Classes/UConfig.pas
index 51e9348e..a7b0f328 100644
--- a/Game/Code/Classes/UConfig.pas
+++ b/Game/Code/Classes/UConfig.pas
@@ -67,8 +67,19 @@ uses
Sysutils;
const
- // include config-file
+ // IMPORTANT:
+ // If IncludeConstants is defined, the const-sections
+ // of the config-file will be included too.
+ // This switch is necessary because it is not possible to
+ // include the const-sections in the switches.inc.
+ // switches.inc is always included before the first uses-
+ // section but at that place no const-section is allowed.
+ // So we have to include the config-file in switches.inc
+ // with IncludeConstants undefined and in UConfig.pas with
+ // IncludeConstants defined (see the note above).
{$DEFINE IncludeConstants}
+
+ // include config-file (defines + constants)
{$IF Defined(MSWindows)}
{$I ../config-win.inc}
{$ELSEIF Defined(Linux)}
@@ -139,14 +150,14 @@ const
(LIBAVUTIL_VERSION_MINOR * VERSION_MINOR) +
(LIBAVUTIL_VERSION_RELEASE * VERSION_RELEASE);
- {$ENDIF}
-
{$IFDEF HaveSWScale}
LIBSWSCALE_VERSION = (LIBSWSCALE_VERSION_MAJOR * VERSION_MAJOR) +
(LIBSWSCALE_VERSION_MINOR * VERSION_MINOR) +
(LIBSWSCALE_VERSION_RELEASE * VERSION_RELEASE);
{$ENDIF}
-
+
+ {$ENDIF}
+
{$IFDEF HaveProjectM}
PROJECTM_VERSION = (PROJECTM_VERSION_MAJOR * VERSION_MAJOR) +
(PROJECTM_VERSION_MINOR * VERSION_MINOR) +