From 987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6 Mon Sep 17 00:00:00 2001 From: faketruth Date: Wed, 26 Sep 2012 14:36:08 +0000 Subject: Fixed a bug in the inventory system where it would de-sync when dragging items with non-default metadata/health Android: Updated VS2008 project to point to correct Android files Android: Updated makefiles to compile CryptoPP Android: Modified CryptoPP config.h and misc.cpp so it compiles for Android Android: Added pretty MCServer icons git-svn-id: http://mc-server.googlecode.com/svn/trunk@893 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- CryptoPP/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CryptoPP/config.h') diff --git a/CryptoPP/config.h b/CryptoPP/config.h index 93a79ed3d..ba7c00110 100644 --- a/CryptoPP/config.h +++ b/CryptoPP/config.h @@ -243,7 +243,7 @@ NAMESPACE_END # pragma warn -8037 #endif -#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || defined(_STLPORT_VERSION) +#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || defined(_STLPORT_VERSION) || defined(ANDROID_NDK) #define CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION #endif -- cgit v1.2.3