[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22893] branches/blender2.5/blender/extern /xvidcore/build/generic: 2.5: fix for nasm.inc compile error.

[Brecht Van Lommel]

Revision: 22893
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22893
Author:   blendix
Date:     2009-08-30 18:27:01 +0200 (Sun, 30 Aug 2009)

Log Message:
-----------
2.5: fix for nasm.inc compile error.

Modified Paths:
--------------
    branches/blender2.5/blender/extern/xvidcore/build/generic/configure
    branches/blender2.5/blender/extern/xvidcore/build/generic/configure.in

Modified: branches/blender2.5/blender/extern/xvidcore/build/generic/configure
===================================================================
--- branches/blender2.5/blender/extern/xvidcore/build/generic/configure	2009-08-30 16:18:05 UTC (rev 22892)
+++ branches/blender2.5/blender/extern/xvidcore/build/generic/configure	2009-08-30 16:27:01 UTC (rev 22893)
@@ -4112,7 +4112,7 @@
 
        AS="$chosen_asm_prog"
        ASSEMBLY_EXTENSION="asm"
-       AFLAGS="-I\$(<D)/ -I../../src/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
+       AFLAGS="-I\$(<D)/ -Iextern/xvidcore/src/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
        ASSEMBLY_SOURCES="SRC_${ARCHITECTURE}"
        if test "$ARCHITECTURE" = "X86_64" ; then
                AFLAGS=${AFLAGS}" -DARCH_IS_X86_64"

Modified: branches/blender2.5/blender/extern/xvidcore/build/generic/configure.in
===================================================================
--- branches/blender2.5/blender/extern/xvidcore/build/generic/configure.in	2009-08-30 16:18:05 UTC (rev 22892)
+++ branches/blender2.5/blender/extern/xvidcore/build/generic/configure.in	2009-08-30 16:27:01 UTC (rev 22893)
@@ -436,7 +436,7 @@
 
        AS="$chosen_asm_prog"
        ASSEMBLY_EXTENSION="asm"
-       AFLAGS="-I\$(<D)/ -I../../src/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
+       AFLAGS="-I\$(<D)/ -Iextern/xvidcore/src/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
        ASSEMBLY_SOURCES="SRC_${ARCHITECTURE}"
        if test "$ARCHITECTURE" = "X86_64" ; then
                AFLAGS=${AFLAGS}" -DARCH_IS_X86_64"