Skip to content
Permalink
Browse files
Merge pull request #6291 from JosJuice/remove-soil
Replace usage of SOIL with libpng
  • Loading branch information
leoetlino committed May 20, 2018
2 parents 0706add + 10ff6d7 commit 86c676a
Show file tree
Hide file tree
Showing 32 changed files with 237 additions and 8,578 deletions.
@@ -670,17 +670,6 @@ else()
include_directories(BEFORE Externals/curl/include)
endif()

if(NOT APPLE)
check_lib(SOIL "(no .pc for SOIL)" SOIL SOIL/SOIL.h QUIET)
endif()
if(SOIL_FOUND)
message(STATUS "Using shared SOIL")
else()
message(STATUS "Using static SOIL from Externals")
add_subdirectory(Externals/SOIL)
include_directories(Externals/SOIL)
endif()

if (NOT ANDROID)
find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
find_path(ICONV_INCLUDE_DIR NAMES iconv.h)

This file was deleted.

0 comments on commit 86c676a

Please sign in to comment.