Fixed windows compilation, updated VS9 project file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12597 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
bc1d1e7d31
commit
ca39376f25
@ -26,6 +26,13 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
|
||||
# define isnan _isnan
|
||||
#else
|
||||
# include <math.h>
|
||||
#endif
|
||||
|
||||
|
||||
AnimationBase::AnimationBase(const XMLNode &node)
|
||||
{
|
||||
float fps=25;
|
||||
|
@ -22,6 +22,12 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
|
||||
# define isnan _isnan
|
||||
#else
|
||||
# include <math.h>
|
||||
#endif
|
||||
|
||||
const std::string Ipo::m_all_channel_names[IPO_MAX] =
|
||||
{"LocX", "LocY", "LocZ", "LocXYZ",
|
||||
"RotX", "RotY", "RotZ",
|
||||
|
@ -1345,10 +1345,6 @@
|
||||
RelativePath="..\..\animations\animation_base.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\animations\billboard_animation.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\animations\ipo.cpp"
|
||||
>
|
||||
@ -2535,10 +2531,6 @@
|
||||
RelativePath="..\..\animations\animation_base.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\animations\billboard_animation.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\animations\ipo.hpp"
|
||||
>
|
||||
|
@ -258,6 +258,7 @@ TrackObject* TrackObjectManager::insertObject(const std::string& model,
|
||||
*/
|
||||
assert(false);
|
||||
// TODO
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user