Fix CROWN_PLATFORM_* checks

engine/Config.h

@@ -84,7 +84,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 	#undef CROWN_PLATFORM_ANDROID
 	#define CROWN_PLATFORM_ANDROID 1
 #elif defined(__linux__)
-	#undef CROWN_PLATFORM_ANDROID
 	#undef CROWN_PLATFORM_LINUX
 	#define CROWN_PLATFORM_LINUX 1
 #elif defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__)

engine/Device.cpp

@@ -57,11 +57,11 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "NetworkFilesystem.h"
 #include "LuaSystem.h"
 
-#if defined(CROWN_PLATFORM_LINUX) || defined(CROWN_PLATFORM_WINDOWS)
+#if CROWN_PLATFORM_LINUX || CROWN_PLATFORM_WINDOWS
 	#include "BundleCompiler.h"
 #endif
 
-#if defined(CROWN_PLATFORM_ANDROID)
+#if CROWN_PLATFORM_ANDROID
 	#include "ApkFilesystem.h"
 #endif
 
@@ -120,7 +120,7 @@ void Device::init()
 
 	CE_LOGD("Creating filesystem...");
 	// Default bundle filesystem
-	#if defined (CROWN_PLATFORM_LINUX) || defined(CROWN_PLATFORM_WINDOWS)
+	#if CROWN_PLATFORM_LINUX || CROWN_PLATFORM_WINDOWS
 		if (m_fileserver == 1)
 		{
 			m_filesystem = CE_NEW(m_allocator, NetworkFilesystem)(NetAddress(127, 0, 0, 1), 10001);
@@ -129,7 +129,7 @@ void Device::init()
 		{
 			m_filesystem = CE_NEW(m_allocator, DiskFilesystem)(m_bundle_dir);
 		}
-	#elif defined(CROWN_PLATFORM_ANDROID)
+	#elif CROWN_PLATFORM_ANDROID
 		if (m_fileserver == 1)
 		{
 			m_filesystem = CE_NEW(m_allocator, NetworkFilesystem)(NetAddress(192, 168, 0, 7), 10001);

engine/core/Error.h

@@ -33,7 +33,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include <stdio.h>
 #include <stdarg.h>
 
-#if defined(CROWN_COMPILER_GCC) && defined(CROWN_PLATFORM_LINUX)
+#if CROWN_PLATFORM_LINUX && CROWN_COMPILER_GCC
 	#include <cxxabi.h>
 	#include <execinfo.h>
 #endif
@@ -45,7 +45,7 @@ namespace error
 
 inline void log_backtrace()
 {
-	#if defined(CROWN_COMPILER_GCC) && defined(CROWN_PLATFORM_LINUX)
+	#if CROWN_PLATFORM_LINUX && CROWN_COMPILER_GCC
 	void* array[50];
 	int size = backtrace(array, 50);
 

engine/core/Types.h

@@ -62,12 +62,3 @@ struct Id
 		return id != other.id || index != other.index;
 	}
 };
-
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL    0
-#else
-#define NULL    ((void *)0)
-#endif
-#endif
-

engine/os/OS.h

@@ -37,14 +37,14 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-#if defined(CROWN_PLATFORM_LINUX)
+#if CROWN_PLATFORM_LINUX
 	const size_t	MAX_PATH_LENGTH = 1024;
 	const char		PATH_SEPARATOR = '/';
-#elif defined(CROWN_PLATFORM_WINDOWS)
+#elif CROWN_PLATFORM_WINDOWS
 	const size_t	MAX_PATH_LENGTH = 1024;
 	const char		PATH_SEPARATOR = '\\';
 	#define snprintf _snprintf
-#elif defined(CROWN_PLATFORM_ANDROID)
+#elif CROWN_PLATFORM_ANDROID
 	const size_t	MAX_PATH_LENGTH = 1024;
 	const char		PATH_SEPARATOR = '/';
 #else

engine/renderers/backend/gl/GLRenderer.cpp

@@ -26,10 +26,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "Config.h"
 
-#if defined(CROWN_PLATFORM_LINUX) || defined(CROWN_PLATFORM_WINDOWS)
+#if CROWN_PLATFORM_LINUX || CROWN_PLATFORM_WINDOWS
 	#define GL_GLEXT_PROTOTYPES
 	#include <GL/glcorearb.h>
-#elif defined(CROWN_PLATFORM_ANDROID)
+#elif CROWN_PLATFORM_ANDROID
 	#include <GLES2/gl2.h>
 	#include <GLES2/gl2ext.h>
 #else
@@ -88,7 +88,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 	#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
 #endif
 
-#ifdef ANDROID
+#if CROWN_PLATFORM_ANDROID
 	#define GL_DEPTH_STENCIL GL_DEPTH_STENCIL_OES
 	#ifndef GL_DEPTH_STENCIL_ATTACHMENT
 		#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
@@ -96,7 +96,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 	#define GL_DEPTH_COMPONENT24 GL_DEPTH_COMPONENT24_OES
 	#define GL_DEPTH_COMPONENT32 GL_DEPTH_COMPONENT32_OES
 	#define GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES
-#endif // ANDROID
+#endif // CROWN_PLATFORM_ANDROID
 
 namespace crown
 {
@@ -884,9 +884,9 @@ public:
 					GLbitfield gl_clear = (clear.m_flags & CLEAR_COLOR) ? GL_COLOR_BUFFER_BIT : 0;
 					gl_clear |= (clear.m_flags & CLEAR_DEPTH) ? GL_DEPTH_BUFFER_BIT : 0;
 					GL_CHECK(glClearColor(clear.m_color.r, clear.m_color.g, clear.m_color.b, clear.m_color.a));
-					#if defined(CROWN_PLATFORM_LINUX) || defined(CROWN_PLATFORM_WINDOWS)
+					#if CROWN_PLATFORM_LINUX || CROWN_PLATFORM_WINDOWS
 						GL_CHECK(glClearDepth(clear.m_depth));
-					#elif defined(CROWN_PLATFORM_ANDROID)
+					#elif CROWN_PLATFORM_ANDROID
 						GL_CHECK(glClearDepthf(clear.m_depth));
 					#endif
 					GL_CHECK(glClear(gl_clear));

engine/resource/LuaResource.cpp

@@ -32,7 +32,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "OS.h"
 #include "TempAllocator.h"
 
-#ifdef WINDOWS
+#if CROWN_PLATFORM_WINDOWS
 	#define LUAJIT_EXECUTABLE "luajit.exe"
 #else
 	#define LUAJIT_EXECUTABLE "./luajit"