mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
kodi: update disable-internal-texturepacker patch
Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
parent
602b068dd1
commit
90d4c81fa9
@ -1,16 +1,20 @@
|
|||||||
diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake
|
diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake
|
||||||
index a4acf6453a..c56630001a 100644
|
index 4817d15799..c56630001a 100644
|
||||||
--- a/cmake/modules/buildtools/FindTexturePacker.cmake
|
--- a/cmake/modules/buildtools/FindTexturePacker.cmake
|
||||||
+++ b/cmake/modules/buildtools/FindTexturePacker.cmake
|
+++ b/cmake/modules/buildtools/FindTexturePacker.cmake
|
||||||
@@ -50,11 +50,6 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable)
|
@@ -52,15 +52,6 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable)
|
||||||
# and unset TEXTUREPACKER_EXECUTABLE variable
|
|
||||||
message(WARNING "Could not find '${APP_NAME_LC}-TexturePacker' or 'TexturePacker' executable in ${_tppath} supplied by -DWITH_TEXTUREPACKER. Make sure the executable file name matches these names!")
|
|
||||||
endif()
|
endif()
|
||||||
- else()
|
|
||||||
- # Ship TexturePacker only on Linux and FreeBSD
|
|
||||||
- if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
|
||||||
- set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE CACHE BOOL "" FORCE)
|
|
||||||
- endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
- # Ship TexturePacker only on Linux and FreeBSD
|
||||||
|
- if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||||
|
- # But skip shipping it if build architecture can be executed on host
|
||||||
|
- # and TEXTUREPACKER_EXECUTABLE is found
|
||||||
|
- if(NOT (HOST_CAN_EXECUTE_TARGET AND TEXTUREPACKER_EXECUTABLE))
|
||||||
|
- set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE CACHE BOOL "" FORCE)
|
||||||
|
- endif()
|
||||||
|
- endif()
|
||||||
|
-
|
||||||
# Use it during build if build architecture can be executed on host
|
# Use it during build if build architecture can be executed on host
|
||||||
|
# and TEXTUREPACKER_EXECUTABLE is not found
|
||||||
|
if(HOST_CAN_EXECUTE_TARGET AND NOT TEXTUREPACKER_EXECUTABLE)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user