mirror of
https://github.com/glest/glest-source.git
synced 2025-08-13 11:54:00 +02:00
- fix for compiling md5 files on windows
This commit is contained in:
@@ -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:
|
||||
|
@@ -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;
|
||||
|
@@ -23,7 +23,9 @@
|
||||
#endif // _WIN32
|
||||
|
||||
#include <GL/gl.h>
|
||||
#ifndef _WIN32
|
||||
#include <GL/glext.h>
|
||||
#endif
|
||||
#include <memory>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user