- fix for compiling md5 files on windows

This commit is contained in:
Mark Vejvoda
2011-10-18 06:09:58 +00:00
parent a2ae980986
commit 6bf2d2697e
10 changed files with 90 additions and 56 deletions

View File

@@ -20,11 +20,14 @@
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <memory>
#endif // _WIN32
#include <GL/glew.h>
#ifndef _WIN32
//#include <boost/shared_ptr.hpp>
#include <tr1/memory>
#endif
#include <stdexcept>
#include <iostream>
#include <fstream>
@@ -39,10 +42,16 @@ using std::cout;
using std::endl;
using std::string;
#ifdef _WIN32
using std::tr1::shared_ptr;
#endif
namespace Shared { namespace Graphics { namespace md5 {
#ifndef _WIN32
//using boost::shared_ptr;
using std::tr1::shared_ptr;
#endif
/////////////////////////////////////////////////////////////////////////////
// Image class diagram:

View File

@@ -21,6 +21,7 @@
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <memory>
#endif // _WIN32
#include <string>
@@ -40,7 +41,9 @@ using std::string;
using std::vector;
using std::map;
//using std::shared_ptr;
#ifdef _WIN32
using std::tr1::shared_ptr;
#endif
// Forward declarations
class Md5Skeleton;

View File

@@ -23,7 +23,9 @@
#endif // _WIN32
#include <GL/gl.h>
#ifndef _WIN32
#include <GL/glext.h>
#endif
#include <memory>
#include <stdexcept>
#include <string>

View File

@@ -18,7 +18,7 @@ namespace Shared { namespace Graphics { namespace md5 {
class Md5Object;
class Real;
//class Real;
template <typename Real>
class Matrix4x4;
typedef Matrix4x4<float> Matrix4x4f;