X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=jpeg.c;h=8d32adcbe19c7b708b1bc6d38dc13465a4a33aaa;hb=49e58f6cac0b5fa389f75b8e53ab8e705c63c0f9;hp=4b276d2e1549c5fd5c2ca175a16c5e8e25c5a703;hpb=cfee52a1ec9db338098789cae89ae5cf1f7a6fbf;p=xonotic%2Fdarkplaces.git

diff --git a/jpeg.c b/jpeg.c
index 4b276d2e..8d32adcb 100644
--- a/jpeg.c
+++ b/jpeg.c
@@ -515,6 +515,12 @@ qboolean JPEG_OpenLibrary (void)
 
 	jpeg_tried_loading = true;
 
+#ifdef __ANDROID__
+	// loading the native Android libjpeg.so causes crashes
+	Con_Printf("Not opening libjpeg.so dynamically on Android - use LINK_TO_LIBJPEG instead if it is needed.\n");
+	return false;
+#endif
+
 	// Load the DLL
 	return Sys_LoadLibrary (dllnames, &jpeg_dll, jpegfuncs);
 #endif