Browse Source

Reinstate the Assimp fix for Raspberry Pi build.
Remove unsupported GCC attribute to suppress the warnings when building Assimp library (commit: 50556078d6a53d7ff17a811aa67a53587e390d10).

Yao Wei Tjong 姚伟忠 11 years ago
parent
commit
11c41c64bc
1 changed files with 4 additions and 1 deletions
  1. 4 1
      Source/ThirdParty/Assimp/include/assimp/Compiler/pushpack1.h

+ 4 - 1
Source/ThirdParty/Assimp/include/assimp/Compiler/pushpack1.h

@@ -18,6 +18,9 @@
 //
 // ===============================================================================
 
+// Modified by Yao Wei Tjong for Urho3D
+// Suppress 'gcc_struct' is being ignored warnings when compiling for Raspberry-PI
+
 #ifdef AI_PUSHPACK_IS_DEFINED
 #	error poppack1.h must be included after pushpack1.h
 #endif
@@ -26,7 +29,7 @@
 #	pragma pack(push,1)
 #	define PACK_STRUCT
 #elif defined( __GNUC__ )
-#	if defined(__clang__)
+#	if defined(__clang__) || defined(RASPI)
 #		define PACK_STRUCT	__attribute__((__packed__))
 #	else
 #		define PACK_STRUCT	__attribute__((gcc_struct, __packed__))