Removed dependency to libjpeg, stb_image_write now supports writing J…

…PEG files
yangu-hury · Sep 28, 2017 · 2aa70de · 2aa70de
1 parent 4494498
commit 2aa70de
Show file tree

Hide file tree

Showing 26 changed files with 8 additions and 1,986 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -513,7 +513,7 @@ elseif(SFML_OS_IOS)
         # since the iOS libraries are built as static, we must install the SFML dependencies
         # too so that the end user can easily link them to its final application
         if(SFML_BUILD_GRAPHICS)
-            install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib)
+            install(FILES extlibs/libs-ios/libfreetype.a DESTINATION lib)
         endif()
     endif()
 

diff --git a/cmake/Modules/FindSFML.cmake b/cmake/Modules/FindSFML.cmake
@@ -311,10 +311,9 @@ if(SFML_STATIC_LIBRARIES)
 
         # find libraries
         find_sfml_dependency(FREETYPE_LIBRARY "FreeType" freetype)
-        find_sfml_dependency(JPEG_LIBRARY "libjpeg" jpeg)
 
         # update the list
-        set(SFML_GRAPHICS_DEPENDENCIES ${FREETYPE_LIBRARY} ${JPEG_LIBRARY})
+        set(SFML_GRAPHICS_DEPENDENCIES ${FREETYPE_LIBRARY})
         set(SFML_DEPENDENCIES ${SFML_GRAPHICS_DEPENDENCIES} ${SFML_DEPENDENCIES})
     endif()
 

diff --git a/extlibs/Android.mk b/extlibs/Android.mk
@@ -6,12 +6,6 @@ LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libfreetype.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := jpeg
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libjpeg.a
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-include $(PREBUILT_STATIC_LIBRARY)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := openal
 LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libopenal.so

diff --git a/extlibs/headers/jpeg/jconfig.h b/extlibs/headers/jpeg/jconfig.h
diff --git a/extlibs/headers/jpeg/jerror.h b/extlibs/headers/jpeg/jerror.h