Sfoglia il codice sorgente

Update some #ifdefs

mikymod 11 anni fa
parent
commit
4fc5980ed4
2 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 2 2
      engine/Device.cpp
  2. 2 2
      engine/core/Error.h

+ 2 - 2
engine/Device.cpp

@@ -120,7 +120,7 @@ void Device::init()
 
 	CE_LOGD("Creating filesystem...");
 	// Default bundle filesystem
-	#if defined (LINUX) || defined(WINDOWS)
+	#if defined (CROWN_PLATFORM_LINUX) || defined(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(ANDROID)
+	#elif defined(CROWN_PLATFORM_ANDROID)
 		if (m_fileserver == 1)
 		{
 			m_filesystem = CE_NEW(m_allocator, NetworkFilesystem)(NetAddress(192, 168, 0, 7), 10001);

+ 2 - 2
engine/core/Error.h

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