Переглянути джерело

Fix some warnings when building android release

Daniele Bartolini 11 роки тому
батько
коміт
fc3670daee

+ 15 - 1
engine/Android.mk

@@ -250,7 +250,21 @@ LOCAL_C_INCLUDES	:=\
 	$(LOCAL_PATH)/third/ARMv7/physx/include/RepXUpgrader\
 	$(LOCAL_PATH)/third/ARMv7/physx/include/RepXUpgrader\
 	$(LOCAL_PATH)/third/ARMv7/physx/include/vehicle\
 	$(LOCAL_PATH)/third/ARMv7/physx/include/vehicle\
 	
 	
-LOCAL_CPPFLAGS := -fno-rtti -fno-exceptions -std=c++03 -ansi -Wall -Wextra -Wno-long-long -Wno-variadic-macros -Wno-missing-braces -Wno-unused-parameter -Wno-unknown-pragmas -Wno-format
+LOCAL_CPPFLAGS :=\
+	-fno-rtti\
+	-fno-exceptions 
+	-std=c++03\
+	-ansi\
+	-Wall\
+	-Wextra\
+	-Wno-long-long\
+	-Wno-variadic-macros\
+	-Wno-missing-braces\
+	-Wno-unused-parameter\
+	-Wno-unknown-pragmas\
+	-Wno-format\
+	-Wno-unused-but-set-variable\
+
 LOCAL_LDLIBS := -L$(LOCAL_PATH) -Wl,--start-group $(addprefix -l, $(PhysX_libraries)) -Wl,--end-group -llog -landroid -lEGL -lGLESv2 -lz -lOpenSLES
 LOCAL_LDLIBS := -L$(LOCAL_PATH) -Wl,--start-group $(addprefix -l, $(PhysX_libraries)) -Wl,--end-group -llog -landroid -lEGL -lGLESv2 -lz -lOpenSLES
 LOCAL_SHARED_LIBRARIES := luajit-5.1
 LOCAL_SHARED_LIBRARIES := luajit-5.1
 LOCAL_STATIC_LIBRARIES := android_native_app_glue ogg vorbis
 LOCAL_STATIC_LIBRARIES := android_native_app_glue ogg vorbis

+ 19 - 20
engine/audio/backend/SLESSoundWorld.cpp

@@ -44,28 +44,27 @@ namespace crown
 {
 {
 
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-static const char* sles_error_to_string(SLresult result)
-{
-	switch (result)
-	{
-		case SL_RESULT_SUCCESS: return "SL_RESULT_SUCCESS";
-		case SL_RESULT_PARAMETER_INVALID: return "SL_RESULT_PARAMETER_INVALID";
-		case SL_RESULT_MEMORY_FAILURE: return "SL_RESULT_MEMORY_FAILURE";
-		case SL_RESULT_FEATURE_UNSUPPORTED: return "SL_RESULT_FEATURE_UNSUPPORTED";
-		case SL_RESULT_RESOURCE_ERROR: return "SL_RESULT_RESOURCE_ERROR";
-		case SL_RESULT_IO_ERROR: return "SL_RESULT_IO_ERROR";
-		case SL_RESULT_PRECONDITIONS_VIOLATED: return "SL_RESULT_PRECONDITIONS_VIOLATED";
-		case SL_RESULT_CONTENT_CORRUPTED: return "SL_RESULT_CONTENT_CORRUPTED";
-		case SL_RESULT_CONTENT_UNSUPPORTED: return "SL_RESULT_CONTENT_UNSUPPORTED";
-		case SL_RESULT_CONTENT_NOT_FOUND: return "SL_RESULT_CONTENT_NOT_FOUND";
-		case SL_RESULT_PERMISSION_DENIED: return "SL_RESULT_PERMISSION_DENIED";
-		case SL_RESULT_BUFFER_INSUFFICIENT: return "SL_RESULT_BUFFER_INSUFFICIENT";
-		default: return "UNKNOWN_SL_ERROR";
+#if defined(CROWN_DEBUG) || defined(CROWN_DEVELOPMENT)
+	static const char* sles_error_to_string(SLresult result)
+	{
+		switch (result)
+		{
+			case SL_RESULT_SUCCESS: return "SL_RESULT_SUCCESS";
+			case SL_RESULT_PARAMETER_INVALID: return "SL_RESULT_PARAMETER_INVALID";
+			case SL_RESULT_MEMORY_FAILURE: return "SL_RESULT_MEMORY_FAILURE";
+			case SL_RESULT_FEATURE_UNSUPPORTED: return "SL_RESULT_FEATURE_UNSUPPORTED";
+			case SL_RESULT_RESOURCE_ERROR: return "SL_RESULT_RESOURCE_ERROR";
+			case SL_RESULT_IO_ERROR: return "SL_RESULT_IO_ERROR";
+			case SL_RESULT_PRECONDITIONS_VIOLATED: return "SL_RESULT_PRECONDITIONS_VIOLATED";
+			case SL_RESULT_CONTENT_CORRUPTED: return "SL_RESULT_CONTENT_CORRUPTED";
+			case SL_RESULT_CONTENT_UNSUPPORTED: return "SL_RESULT_CONTENT_UNSUPPORTED";
+			case SL_RESULT_CONTENT_NOT_FOUND: return "SL_RESULT_CONTENT_NOT_FOUND";
+			case SL_RESULT_PERMISSION_DENIED: return "SL_RESULT_PERMISSION_DENIED";
+			case SL_RESULT_BUFFER_INSUFFICIENT: return "SL_RESULT_BUFFER_INSUFFICIENT";
+			default: return "UNKNOWN_SL_ERROR";
+		}
 	}
 	}
-}
 
 
-//-----------------------------------------------------------------------------
-#if defined(CROWN_DEBUG) || defined(CROWN_DEVELOPMENT)
 	#define SL_CHECK(function)\
 	#define SL_CHECK(function)\
 		do { SLresult result = function;\
 		do { SLresult result = function;\
 				CE_ASSERT(result == SL_RESULT_SUCCESS, "OpenSL|ES error: %s", sles_error_to_string(result)); } while (0)
 				CE_ASSERT(result == SL_RESULT_SUCCESS, "OpenSL|ES error: %s", sles_error_to_string(result)); } while (0)

+ 5 - 0
engine/os/android/ApkFile.cpp

@@ -27,6 +27,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include <android/asset_manager_jni.h>
 #include <android/asset_manager_jni.h>
 #include "ApkFile.h"
 #include "ApkFile.h"
 #include "Assert.h"
 #include "Assert.h"
+#include "Macros.h"
 
 
 static AAssetManager* g_android_asset_manager = NULL;
 static AAssetManager* g_android_asset_manager = NULL;
 
 
@@ -68,6 +69,7 @@ void ApkFile::seek(size_t position)
 {
 {
 	off_t seek_result = AAsset_seek(m_asset, (off_t)position, SEEK_SET);
 	off_t seek_result = AAsset_seek(m_asset, (off_t)position, SEEK_SET);
 	CE_ASSERT(seek_result != (off_t) -1, "Failed to seek");
 	CE_ASSERT(seek_result != (off_t) -1, "Failed to seek");
+	CE_UNUSED(seek_result);
 }
 }
 
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -75,6 +77,7 @@ void ApkFile::seek_to_end()
 {
 {
 	off_t seek_result = AAsset_seek(m_asset, 0, SEEK_END);
 	off_t seek_result = AAsset_seek(m_asset, 0, SEEK_END);
 	CE_ASSERT(seek_result != (off_t) -1, "Failed to seek to end");
 	CE_ASSERT(seek_result != (off_t) -1, "Failed to seek to end");
+	CE_UNUSED(seek_result);
 }
 }
 
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -82,6 +85,7 @@ void ApkFile::skip(size_t bytes)
 {
 {
 	off_t seek_result = AAsset_seek(m_asset, (off_t) bytes, SEEK_CUR);
 	off_t seek_result = AAsset_seek(m_asset, (off_t) bytes, SEEK_CUR);
 	CE_ASSERT(seek_result != (off_t) -1, "Failed to skip");
 	CE_ASSERT(seek_result != (off_t) -1, "Failed to skip");
+	CE_UNUSED(seek_result);
 }
 }
 
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -91,6 +95,7 @@ void ApkFile::read(void* buffer, size_t size)
 
 
 	size_t bytes_read = (size_t) AAsset_read(m_asset, buffer, size);
 	size_t bytes_read = (size_t) AAsset_read(m_asset, buffer, size);
 	CE_ASSERT(bytes_read == size, "Failed to read from file: requested: %lu, read: %lu", size, bytes_read);
 	CE_ASSERT(bytes_read == size, "Failed to read from file: requested: %lu, read: %lu", size, bytes_read);
+	CE_UNUSED(bytes_read);
 }
 }
 
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

+ 23 - 21
engine/renderers/backend/gl/egl/GLContext.cpp

@@ -37,30 +37,29 @@ namespace crown
 extern ANativeWindow* g_android_window;
 extern ANativeWindow* g_android_window;
 
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-static const char* egl_error_to_string(EGLint error)
-{
-	switch (error)
+#if defined(CROWN_DEBUG) || defined(CROWN_DEVELOPMENT)
+	static const char* egl_error_to_string(EGLint error)
 	{
 	{
-		case EGL_NOT_INITIALIZED: return "EGL_NOT_INITIALIZED";
-		case EGL_BAD_ACCESS: return "EGL_BAD_ACCESS";
-		case EGL_BAD_ALLOC: return "EGL_BAD_ALLOC";
-		case EGL_BAD_ATTRIBUTE: return "EGL_BAD_ATTRIBUTE";
-		case EGL_BAD_CONTEXT: return "EGL_BAD_CONTEXT";
-		case EGL_BAD_CONFIG: return "EGL_BAD_CONFIG";
-		case EGL_BAD_CURRENT_SURFACE: return "EGL_BAD_CURRENT_SURFACE";
-		case EGL_BAD_DISPLAY: return "EGL_BAD_DISPLAY";
-		case EGL_BAD_SURFACE: return "EGL_BAD_SURFACE";
-		case EGL_BAD_MATCH: return "EGL_BAD_MATCH";
-		case EGL_BAD_PARAMETER: return "EGL_BAD_PARAMETER";
-		case EGL_BAD_NATIVE_PIXMAP: return "EGL_BAD_NATIVE_PIXMAP";
-		case EGL_BAD_NATIVE_WINDOW: return "EGL_BAD_NATIVE_WINDOW";
-		case EGL_CONTEXT_LOST: return "EGL_CONTEXT_LOST";
-		default: return "UNKNOWN_EGL_ERROR";
+		switch (error)
+		{
+			case EGL_NOT_INITIALIZED: return "EGL_NOT_INITIALIZED";
+			case EGL_BAD_ACCESS: return "EGL_BAD_ACCESS";
+			case EGL_BAD_ALLOC: return "EGL_BAD_ALLOC";
+			case EGL_BAD_ATTRIBUTE: return "EGL_BAD_ATTRIBUTE";
+			case EGL_BAD_CONTEXT: return "EGL_BAD_CONTEXT";
+			case EGL_BAD_CONFIG: return "EGL_BAD_CONFIG";
+			case EGL_BAD_CURRENT_SURFACE: return "EGL_BAD_CURRENT_SURFACE";
+			case EGL_BAD_DISPLAY: return "EGL_BAD_DISPLAY";
+			case EGL_BAD_SURFACE: return "EGL_BAD_SURFACE";
+			case EGL_BAD_MATCH: return "EGL_BAD_MATCH";
+			case EGL_BAD_PARAMETER: return "EGL_BAD_PARAMETER";
+			case EGL_BAD_NATIVE_PIXMAP: return "EGL_BAD_NATIVE_PIXMAP";
+			case EGL_BAD_NATIVE_WINDOW: return "EGL_BAD_NATIVE_WINDOW";
+			case EGL_CONTEXT_LOST: return "EGL_CONTEXT_LOST";
+			default: return "UNKNOWN_EGL_ERROR";
+		}
 	}
 	}
-}
 
 
-//-----------------------------------------------------------------------------
-#if defined(CROWN_DEBUG) || defined(CROWN_DEVELOPMENT)
 	#define EGL_CHECK(function)\
 	#define EGL_CHECK(function)\
 		function;\
 		function;\
 		do { EGLint error; CE_ASSERT((error = eglGetError()) == EGL_SUCCESS,\
 		do { EGLint error; CE_ASSERT((error = eglGetError()) == EGL_SUCCESS,\
@@ -95,14 +94,17 @@ void GLContext::create_context()
 	EGLint egl_major, egl_minor;
 	EGLint egl_major, egl_minor;
 	EGLBoolean init_success = EGL_CHECK(eglInitialize(display, &egl_major, &egl_minor));
 	EGLBoolean init_success = EGL_CHECK(eglInitialize(display, &egl_major, &egl_minor));
 	CE_ASSERT(init_success == EGL_TRUE, "Failed to initialize EGL");
 	CE_ASSERT(init_success == EGL_TRUE, "Failed to initialize EGL");
+	CE_UNUSED(init_success);
 
 
 	CE_LOGD("EGL Initialized: major = %d, minor = %d", egl_major, egl_minor);
 	CE_LOGD("EGL Initialized: major = %d, minor = %d", egl_major, egl_minor);
 
 
 	EGLBoolean bind_success = EGL_CHECK(eglBindAPI(EGL_OPENGL_ES_API));
 	EGLBoolean bind_success = EGL_CHECK(eglBindAPI(EGL_OPENGL_ES_API));
 	CE_ASSERT(bind_success != EGL_FALSE, "Failed to bind OpenGL|ES API");
 	CE_ASSERT(bind_success != EGL_FALSE, "Failed to bind OpenGL|ES API");
+	CE_UNUSED(bind_success);
 
 
 	EGLBoolean cfg_success = EGL_CHECK(eglChooseConfig(display, attrib_list, &config, 1, &num_configs));
 	EGLBoolean cfg_success = EGL_CHECK(eglChooseConfig(display, attrib_list, &config, 1, &num_configs));
 	CE_ASSERT(cfg_success == EGL_TRUE, "Failed to choose EGL configuration");
 	CE_ASSERT(cfg_success == EGL_TRUE, "Failed to choose EGL configuration");
+	CE_UNUSED(cfg_success);
 
 
 	EGLint format;
 	EGLint format;
 	EGL_CHECK(eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &format));
 	EGL_CHECK(eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &format));