Skip to content

Commit

Permalink
sdl2_image: simplify imageio handling
Browse files Browse the repository at this point in the history
  • Loading branch information
Croydon committed Jan 1, 2021
1 parent 91a9536 commit a200b88
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions recipes/sdl2_image/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def _configure_cmake(self):
self._cmake = CMake(self)
self._cmake.definitions["BMP"] = self.options.bmp
self._cmake.definitions["GIF"] = self.options.gif
self._cmake.definitions["IMAGEIO"] = self.options.get_safe("imageio")
self._cmake.definitions["JPG"] = self.options.jpg
self._cmake.definitions["LBM"] = self.options.lbm
self._cmake.definitions["PCX"] = self.options.pcx
Expand All @@ -103,10 +104,6 @@ def _configure_cmake(self):
self._cmake.definitions["PNG_DYNAMIC"] = self.options["libpng"].shared if self.options.png else False
self._cmake.definitions["WEBP_DYNAMIC"] = self.options["libwebp"].shared if self.options.webp else False
self._cmake.definitions["SDL2_DYNAMIC"] = self.options["sdl2"].shared
if self.settings.os == "Macos":
self._cmake.definitions["IMAGEIO"] = self.options.imageio
else:
self._cmake.definitions["IMAGEIO"] = False

self._cmake.configure(build_dir="build")
return self._cmake
Expand Down

0 comments on commit a200b88

Please sign in to comment.