Re: [CrystalSpace] #996: assimpldr.cpp compile error on Fedora 18
"CrystalSpace" <[email protected]> Sat, 03 Aug 2013 06:05:09 -0000
| Newsgroups | gmane.comp.graphics.crystalspace.tracker |
|---|---|
| Message-ID | <[email protected]> |
#996: assimpldr.cpp compile error on Fedora 18
---------------------------+------------------------------------------------
Reporter: ralphcampbell | Owner: admin
Type: defect | Status: new
Priority: minor | Milestone:
Component: other plugins | Version: V2.1
Keywords: |
---------------------------+------------------------------------------------
Comment(by ralphcampbell):
I have an updated patch which I will commit if you think it is worthy.
I didn't want to abuse my new powers with my first change! :-)
I can't verify configure works with a pure 2.0 or 3.0 assimp but I did
download the code and check the header files so I think it will work
portably.
Fortunately, I have autoconf 2.69 so bin/autogen.sh reproduced the same
configure before my changes.
{{{
Index: configure
===================================================================
--- configure (revision 39545)
+++ configure (working copy)
@@ -66634,6 +66634,8 @@
# Check for Open Asset Import Library (Assimp). Also check whether this
is the
# version 2.0 or 3.0/above that is being used, the header files to be
included
# not being the same.
+# There is no official version 2.1 but some distros updated Logger.h to
+# define the 3.0 enum ErrorSeverity values so we use 21 to indicate that.
#------------------------------------------------------------------------------
# Check whether --with-assimp was given.
@@ -67324,7 +67326,7 @@
if test "" != yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Assimp v3" >&5
$as_echo_n "checking for Assimp v3... " >&6; }
-if ${cs_cv_assimp3+:} false; then :
+if ${cs_cv_assimp30+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_ext=cpp
@@ -67430,16 +67432,16 @@
cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libassimp_cflags
$cs_cv_libz_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libassimp_lflags
$cs_cv_libz_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_libs=`echo x$cs_libs_test $cs_cv_libassimp_libs
$cs_cv_libz_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_assimp3=yes
- cs_cv_assimp3_cflags=$cs_build_cflags
- cs_cv_assimp3_lflags=$cs_build_lflags
- cs_cv_assimp3_libs=$cs_build_libs
+ cs_cv_assimp30=yes
+ cs_cv_assimp30_cflags=$cs_build_cflags
+ cs_cv_assimp30_lflags=$cs_build_lflags
+ cs_cv_assimp30_libs=$cs_build_libs
else
- cs_cv_assimp3=no
+ cs_cv_assimp30=no
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cs_cv_assimp3" >&5
-$as_echo "$cs_cv_assimp3" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cs_cv_assimp30" >&5
+$as_echo "$cs_cv_assimp30" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Assimp v3" >&5
$as_echo_n "checking for Assimp v3... " >&6; }
@@ -67546,27 +67548,27 @@
cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libassimp_cflags
$cs_cv_libz_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libassimp_lflags
$cs_cv_libz_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_libs=`echo x$cs_libs_test $cs_cv_libassimp_libs
$cs_cv_libz_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_assimp3=yes
- cs_cv_assimp3_cflags=$cs_build_cflags
- cs_cv_assimp3_lflags=$cs_build_lflags
- cs_cv_assimp3_libs=$cs_build_libs
+ cs_cv_assimp30=yes
+ cs_cv_assimp30_cflags=$cs_build_cflags
+ cs_cv_assimp30_lflags=$cs_build_lflags
+ cs_cv_assimp30_libs=$cs_build_libs
else
- cs_cv_assimp3=no
+ cs_cv_assimp30=no
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$cs_cv_assimp3" >&5
-$as_echo "$cs_cv_assimp3" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$cs_cv_assimp30" >&5
+$as_echo "$cs_cv_assimp30" >&6; }
fi
- if test $cs_cv_assimp3 = yes; then :
- cs_header_text="${cs_header_text}#define CS_ASSIMP_VERSION 3
+ if test $cs_cv_assimp30 = yes; then :
+ cs_header_text="${cs_header_text}#define CS_ASSIMP_VERSION 30
"
else
- cs_cv_assimp3_cflags=''
- cs_cv_assimp3_lflags=''
- cs_cv_assimp3_libs=''
+ cs_cv_assimp30_cflags=''
+ cs_cv_assimp30_lflags=''
+ cs_cv_assimp30_libs=''
if test "" != yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Assimp v2" >&5
$as_echo_n "checking for Assimp v2... " >&6; }
-if ${cs_cv_assimp2+:} false; then :
+if ${cs_cv_assimp20+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_ext=cpp
@@ -67638,11 +67640,11 @@
LIBS="$cs_libs_test $cs_cv_libassimp_libs $cs_cv_libz_libs
$cs_libs_save"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <assimp/ProgressHandler.h>
+#include <assimp/Logger.h>
int
main ()
{
-
+Assimp::Logger::ErrorSeverity s = Assimp::Logger::ERR
;
return 0;
}
@@ -67672,16 +67674,16 @@
cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libassimp_cflags
$cs_cv_libz_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libassimp_lflags
$cs_cv_libz_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_libs=`echo x$cs_libs_test $cs_cv_libassimp_libs
$cs_cv_libz_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_assimp2=yes
- cs_cv_assimp2_cflags=$cs_build_cflags
- cs_cv_assimp2_lflags=$cs_build_lflags
- cs_cv_assimp2_libs=$cs_build_libs
+ cs_cv_assimp20=yes
+ cs_cv_assimp20_cflags=$cs_build_cflags
+ cs_cv_assimp20_lflags=$cs_build_lflags
+ cs_cv_assimp20_libs=$cs_build_libs
else
- cs_cv_assimp2=no
+ cs_cv_assimp20=no
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cs_cv_assimp2" >&5
-$as_echo "$cs_cv_assimp2" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cs_cv_assimp20" >&5
+$as_echo "$cs_cv_assimp20" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Assimp v2" >&5
$as_echo_n "checking for Assimp v2... " >&6; }
@@ -67754,11 +67756,137 @@
LIBS="$cs_libs_test $cs_cv_libassimp_libs $cs_cv_libz_libs
$cs_libs_save"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <assimp/ProgressHandler.h>
+#include <assimp/Logger.h>
int
main ()
{
+Assimp::Logger::ErrorSeverity s = Assimp::Logger::ERR
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ cs_build_ok=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then :
+ break
+fi
+ done
+
+ CXXFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test $cs_build_ok = yes; then :
+ cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libassimp_cflags
$cs_cv_libz_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libassimp_lflags
$cs_cv_libz_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test $cs_cv_libassimp_libs
$cs_cv_libz_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_assimp20=yes
+ cs_cv_assimp20_cflags=$cs_build_cflags
+ cs_cv_assimp20_lflags=$cs_build_lflags
+ cs_cv_assimp20_libs=$cs_build_libs
+else
+ cs_cv_assimp20=no
+fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$cs_cv_assimp20" >&5
+$as_echo "$cs_cv_assimp20" >&6; }
+fi
+ if test $cs_cv_assimp20 = yes; then :
+ cs_header_text="${cs_header_text}#define CS_ASSIMP_VERSION 20
+"
+else
+ cs_cv_assimp20_cflags=''
+ cs_cv_assimp20_lflags=''
+ cs_cv_assimp20_libs=''
+ if test "" != yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Assimp v2+" >&5
+$as_echo_n "checking for Assimp v2+... " >&6; }
+if ${cs_cv_assimp21+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cs_cflags_save="$CXXFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then :
+ cs_dummy=''
+else
+ if test "$1" = filler; then :
+ cs_dummy=''
+else
+ cs_dummy=$1
+fi
+ shift
+fi
+if test $# -eq 0; then :
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then :
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+ shift
+fi
+if test $# -eq 0; then :
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then :
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+ shift
+fi
+if test $# -eq 0; then :
+ cs_libs_test=''
+else
+ if test "$1" = filler; then :
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+ shift
+fi
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CXXFLAGS="$cs_cflags_save $cs_cflags_test $cs_cv_libassimp_cflags
$cs_cv_libz_cflags"
+ LDFLAGS="$cs_lflags_test $cs_cv_libassimp_lflags
$cs_cv_libz_lflags $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_cv_libassimp_libs $cs_cv_libz_libs
$cs_libs_save"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <assimp/Logger.h>
+int
+main ()
+{
+Assimp::Logger::ErrorSeverity s = Assimp::Logger::Err
;
return 0;
}
@@ -67788,33 +67916,151 @@
cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libassimp_cflags
$cs_cv_libz_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libassimp_lflags
$cs_cv_libz_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_libs=`echo x$cs_libs_test $cs_cv_libassimp_libs
$cs_cv_libz_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_assimp2=yes
- cs_cv_assimp2_cflags=$cs_build_cflags
- cs_cv_assimp2_lflags=$cs_build_lflags
- cs_cv_assimp2_libs=$cs_build_libs
+ cs_cv_assimp21=yes
+ cs_cv_assimp21_cflags=$cs_build_cflags
+ cs_cv_assimp21_lflags=$cs_build_lflags
+ cs_cv_assimp21_libs=$cs_build_libs
else
- cs_cv_assimp2=no
+ cs_cv_assimp21=no
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$cs_cv_assimp2" >&5
-$as_echo "$cs_cv_assimp2" >&6; }
fi
- if test $cs_cv_assimp2 = yes; then :
- cs_header_text="${cs_header_text}#define CS_ASSIMP_VERSION 2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cs_cv_assimp21" >&5
+$as_echo "$cs_cv_assimp21" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Assimp v2+" >&5
+$as_echo_n "checking for Assimp v2+... " >&6; }
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cs_cflags_save="$CXXFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then :
+ cs_dummy=''
+else
+ if test "$1" = filler; then :
+ cs_dummy=''
+else
+ cs_dummy=$1
+fi
+ shift
+fi
+if test $# -eq 0; then :
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then :
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+ shift
+fi
+if test $# -eq 0; then :
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then :
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+ shift
+fi
+if test $# -eq 0; then :
+ cs_libs_test=''
+else
+ if test "$1" = filler; then :
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+ shift
+fi
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CXXFLAGS="$cs_cflags_save $cs_cflags_test $cs_cv_libassimp_cflags
$cs_cv_libz_cflags"
+ LDFLAGS="$cs_lflags_test $cs_cv_libassimp_lflags
$cs_cv_libz_lflags $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_cv_libassimp_libs $cs_cv_libz_libs
$cs_libs_save"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <assimp/Logger.h>
+int
+main ()
+{
+Assimp::Logger::ErrorSeverity s = Assimp::Logger::Err
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ cs_build_ok=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then :
+ break
+fi
+ done
+
+
+ CXXFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test $cs_build_ok = yes; then :
+ cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libassimp_cflags
$cs_cv_libz_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libassimp_lflags
$cs_cv_libz_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test $cs_cv_libassimp_libs
$cs_cv_libz_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_assimp21=yes
+ cs_cv_assimp21_cflags=$cs_build_cflags
+ cs_cv_assimp21_lflags=$cs_build_lflags
+ cs_cv_assimp21_libs=$cs_build_libs
+else
+ cs_cv_assimp21=no
+fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$cs_cv_assimp21" >&5
+$as_echo "$cs_cv_assimp21" >&6; }
+fi
+ if test $cs_cv_assimp21 = yes; then :
+ cs_header_text="${cs_header_text}#define CS_ASSIMP_VERSION 21
"
else
- cs_cv_assimp2_cflags=''
- cs_cv_assimp2_lflags=''
- cs_cv_assimp2_libs=''
+ cs_cv_assimp21_cflags=''
+ cs_cv_assimp21_lflags=''
+ cs_cv_assimp21_libs=''
unset cs_cv_libassimp
fi
fi
fi
+fi
-unset cs_cv_assimp2
+unset cs_cv_assimp20
+unset cs_cv_assimp21
unset cs_cv_assimp2_cflags
unset cs_cv_assimp2_lflags
unset cs_cv_assimp2_libs
-unset cs_cv_assimp3
+unset cs_cv_assimp30
unset cs_cv_assimp3_cflags
unset cs_cv_assimp3_lflags
unset cs_cv_assimp3_libs
Index: configure.ac
===================================================================
--- configure.ac (revision 39545)
+++ configure.ac (working copy)
@@ -1970,25 +1970,37 @@
# Check for Open Asset Import Library (Assimp). Also check whether this
is the
# version 2.0 or 3.0/above that is being used, the header files to be
included
# not being the same.
+# There is no official version 2.1 but some distros updated Logger.h to
+# define the 3.0 enum ErrorSeverity values so we use 21 to indicate that.
#------------------------------------------------------------------------------
CS_CHECK_LIB_WITH([assimp],
[AC_LANG_PROGRAM(
[[]],
[])],
[], [C++],
- [CS_CHECK_BUILD([for Assimp v3], [cs_cv_assimp3],
+ [CS_CHECK_BUILD([for Assimp v3], [cs_cv_assimp30],
[AC_LANG_PROGRAM(
[[#include <assimp/Logger.hpp>]],
[])],
[], [C++],
- [CS_HEADER_PROPERTY([CS_ASSIMP_VERSION], [3])],
- [CS_CHECK_BUILD([for Assimp v2], [cs_cv_assimp2],
+ [CS_HEADER_PROPERTY([CS_ASSIMP_VERSION], [30])],
+ [CS_CHECK_BUILD([for Assimp v2], [cs_cv_assimp20],
[AC_LANG_PROGRAM(
- [[#include <assimp/ProgressHandler.h>]],
- [])],
+ [[#include <assimp/Logger.h>]],
+ [Assimp::Logger::ErrorSeverity s = Assimp::Logger::ERR])],
[], [C++],
- [CS_HEADER_PROPERTY([CS_ASSIMP_VERSION], [2])],
- [unset cs_cv_libassimp], [],
+ [CS_HEADER_PROPERTY([CS_ASSIMP_VERSION], [20])],
+ [CS_CHECK_BUILD([for Assimp v2+], [cs_cv_assimp21],
+ [AC_LANG_PROGRAM(
+ [[#include <assimp/Logger.h>]],
+ [Assimp::Logger::ErrorSeverity s =
Assimp::Logger::Err])],
+ [], [C++],
+ [CS_HEADER_PROPERTY([CS_ASSIMP_VERSION], [21])],
+ [unset cs_cv_libassimp], [],
+ [$cs_cv_libassimp_cflags $cs_cv_libz_cflags],
+ [$cs_cv_libassimp_lflags $cs_cv_libz_lflags],
+ [$cs_cv_libassimp_libs $cs_cv_libz_libs])],
+ [],
[$cs_cv_libassimp_cflags $cs_cv_libz_cflags],
[$cs_cv_libassimp_lflags $cs_cv_libz_lflags],
[$cs_cv_libassimp_libs $cs_cv_libz_libs])],
@@ -2001,11 +2013,12 @@
[$cs_cv_libz_lflags],
[$cs_cv_libz_libs])
-unset cs_cv_assimp2
+unset cs_cv_assimp20
+unset cs_cv_assimp21
unset cs_cv_assimp2_cflags
unset cs_cv_assimp2_lflags
unset cs_cv_assimp2_libs
-unset cs_cv_assimp3
+unset cs_cv_assimp30
unset cs_cv_assimp3_cflags
unset cs_cv_assimp3_lflags
unset cs_cv_assimp3_libs
Index: plugins/mesh/persist/assimpldr/assimpldr.cpp
===================================================================
--- plugins/mesh/persist/assimpldr/assimpldr.cpp (revision 39545)
+++ plugins/mesh/persist/assimpldr/assimpldr.cpp (working copy)
@@ -49,7 +49,7 @@
#include "assimpldr.h"
// The name of those values is different from Assimp 2.0 and above
versions
-#if (CS_ASSIMP_VERSION == 2)
+#if (CS_ASSIMP_VERSION == 20)
#define LOGGER_ERROR Assimp::Logger::ERR
#define LOGGER_WARNING Assimp::Logger::WARN
#define LOGGER_NOTIFY Assimp::Logger::INFO
Index: plugins/mesh/persist/assimpldr/assimpldr.h
===================================================================
--- plugins/mesh/persist/assimpldr/assimpldr.h (revision 39545)
+++ plugins/mesh/persist/assimpldr/assimpldr.h (working copy)
@@ -35,7 +35,7 @@
// The header files to be included are not the same between Assimp 2.0
and
// above versions
-#if (CS_ASSIMP_VERSION == 2)
+#if (CS_ASSIMP_VERSION < 30)
#include "assimp/assimp.hpp"
#include "assimp/aiScene.h"
#include "assimp/aiPostProcess.h"
}}}
--
Ticket URL: <http://trac.crystalspace3d.org/trac/CS/ticket/996#comment:8>
CrystalSpace <http://www.crystalspace3d.org/>
Free open-source 3D SDK.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk