From d4d3d8873fea024cd9e1f17b04416bebe627d1f0 Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 7 Feb 2008 19:52:50 +0000 Subject: 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 --- Game/Code/switches.inc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Game/Code/switches.inc') diff --git a/Game/Code/switches.inc b/Game/Code/switches.inc index a50c759b..66a8ad07 100644 --- a/Game/Code/switches.inc +++ b/Game/Code/switches.inc @@ -34,6 +34,7 @@ {$IF Defined(win32)} + // include defines but no constants {$I config-win.inc} // audio config @@ -53,9 +54,9 @@ // video config {$IFDEF HaveFFMpeg} {$DEFINE UseFFMpegVideo} - {$ENDIF} - {$IFDEF HaveSWScale} - {$DEFINE UseSWScale} + {$IFDEF HaveSWScale} + {$DEFINE UseSWScale} + {$ENDIF} {$ENDIF} // misc defines @@ -72,6 +73,7 @@ {$ENDIF} {$ENDIF} {$ELSEIF Defined(Linux)} + // include defines but no constants {$I config-linux.inc} // audio config @@ -86,9 +88,9 @@ // video config {$IFDEF HaveFFMpeg} {$DEFINE UseFFMpegVideo} - {$ENDIF} - {$IFDEF HaveSWScale} - {$DEFINE UseSWScale} + {$IFDEF HaveSWScale} + {$DEFINE UseSWScale} + {$ENDIF} {$ENDIF} // misc defines -- cgit v1.2.3