Some preparation work for new platform support.
- Added a "PSP" compile-time define to clean up some compile time checks (replaced !WIN32 && !LINUX && !IOS with PSP) -- Wil, I am aware that this is redundant with the PSPENV variable you introduced recently, I think we can clean that up easily -- This looks like lots of changes, but most of the time I just moved some blocks here and there -- tested on VC 2010, PSP, and a bit of NDK -- I might have broken maemo, iOS, or Linux compilation, can you guys check? - Fixed some warnings reported by NDK - NDK still does not compile because recent boost additions (mutex, etc...) are apparently not supported
This commit is contained in:
@@ -11,15 +11,9 @@
|
||||
#ifndef _MD2MODEL_H
|
||||
#define _MD2MODEL_H
|
||||
|
||||
#if defined (WIN32) || defined (LINUX) || defined (IOS)
|
||||
|
||||
#else
|
||||
|
||||
#if defined (PSP)
|
||||
#include <pspgu.h>
|
||||
#include <pspgum.h>
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -236,10 +230,10 @@ private:
|
||||
|
||||
void CheckNextState();
|
||||
|
||||
#if defined (WIN32) || defined (LINUX) || defined (IOS)
|
||||
void CalculateNormal(float *p1, float *p2, float *p3);
|
||||
#else
|
||||
#if defined (PSP)
|
||||
void CalculateNormal(ScePspFVector3* normal, float *p1, float *p2, float *p3);
|
||||
#else
|
||||
void CalculateNormal(float *p1, float *p2, float *p3);
|
||||
#endif
|
||||
|
||||
MD2Animation **mAnimations;
|
||||
|
||||
Reference in New Issue
Block a user