|
@@ -98,7 +98,6 @@ extern void printError(const char* format, ...);
|
|
|
#endif
|
|
#endif
|
|
|
#define WARN(x) printError(x)
|
|
#define WARN(x) printError(x)
|
|
|
#define WARN_VARG(x, ...) printError(x, __VA_ARGS__)
|
|
#define WARN_VARG(x, ...) printError(x, __VA_ARGS__)
|
|
|
-
|
|
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
// Bullet Physics
|
|
// Bullet Physics
|
|
@@ -204,10 +203,10 @@ extern void printError(const char* format, ...);
|
|
|
#define OPENGL_ES_PVR
|
|
#define OPENGL_ES_PVR
|
|
|
#elif WIN32
|
|
#elif WIN32
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
- #define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00
|
|
|
|
|
- #define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01
|
|
|
|
|
- #define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02
|
|
|
|
|
- #define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03
|
|
|
|
|
|
|
+ #define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00
|
|
|
|
|
+ #define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01
|
|
|
|
|
+ #define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02
|
|
|
|
|
+ #define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03
|
|
|
#include <GL/glew.h>
|
|
#include <GL/glew.h>
|
|
|
#elif __APPLE__
|
|
#elif __APPLE__
|
|
|
#include "TargetConditionals.h"
|
|
#include "TargetConditionals.h"
|
|
@@ -322,4 +321,23 @@ extern GLenum __gl_error_code;
|
|
|
extern void amain(struct android_app* state);
|
|
extern void amain(struct android_app* state);
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+// Assert has special behavior on Windows (for Visual Studio).
|
|
|
|
|
+#ifdef WIN32
|
|
|
|
|
+#ifdef assert
|
|
|
|
|
+#undef assert
|
|
|
|
|
+#endif
|
|
|
|
|
+#ifdef _DEBUG
|
|
|
|
|
+#define assert(expression) do { \
|
|
|
|
|
+ if (!(expression)) \
|
|
|
|
|
+ { \
|
|
|
|
|
+ printError("Assertion \'" #expression "\' failed."); \
|
|
|
|
|
+ __debugbreak(); \
|
|
|
|
|
+ } } while (0)
|
|
|
|
|
+
|
|
|
|
|
+#else
|
|
|
|
|
+#define assert(expression) do { (void)sizeof(expression); } while (0)
|
|
|
|
|
+#endif
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
#endif
|
|
#endif
|