Fixed scripts for android build
This commit is contained in:
parent
40329d1aba
commit
b2839abb06
2 changed files with 15 additions and 11 deletions
|
|
@ -233,11 +233,11 @@ else()
|
||||||
find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3-static)
|
find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3-static)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if((NOT EMSCRIPTEN) AND (NOT APPLE))
|
if((NOT EMSCRIPTEN) AND (NOT APPLE) AND (NOT ANDROID))
|
||||||
find_package(TBB REQUIRED)
|
find_package(TBB REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if((NOT (GRAPHICS_BACKEND STREQUAL "Vulkan")) AND (NOT EMSCRIPTEN) AND LINUX AND (NOT NO_CONAN_BUILD))
|
if((NOT (GRAPHICS_BACKEND STREQUAL "Vulkan")) AND (NOT EMSCRIPTEN) AND LINUX AND (NOT NO_CONAN_BUILD) AND (NOT ANDROID))
|
||||||
find_package(egl)
|
find_package(egl)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -352,7 +352,7 @@ else()
|
||||||
message("Place config in global config folder")
|
message("Place config in global config folder")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT EMSCRIPTEN AND ((GRAPHICS_BACKEND STREQUAL "OpenGL3.3") OR (GRAPHICS_BACKEND STREQUAL "OpenGLES3.0") OR (GRAPHICS_BACKEND STREQUAL "OpenGL2.1")))
|
if(NOT EMSCRIPTEN AND ((GRAPHICS_BACKEND STREQUAL "OpenGL3.3") OR (GRAPHICS_BACKEND STREQUAL "OpenGLES3.0") OR (GRAPHICS_BACKEND STREQUAL "OpenGL2.1")) AND (NOT ANDROID))
|
||||||
find_package(OpenGL REQUIRED)
|
find_package(OpenGL REQUIRED)
|
||||||
if(GRAPHICS_BACKEND STREQUAL "OpenGLES3.0")
|
if(GRAPHICS_BACKEND STREQUAL "OpenGLES3.0")
|
||||||
target_link_libraries(main OpenGL::GLES3)
|
target_link_libraries(main OpenGL::GLES3)
|
||||||
|
|
@ -428,15 +428,20 @@ if(NOT EMSCRIPTEN)
|
||||||
target_link_libraries(main harfbuzz::harfbuzz)
|
target_link_libraries(main harfbuzz::harfbuzz)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if((NOT (GRAPHICS_BACKEND STREQUAL "Vulkan")) AND (NOT EMSCRIPTEN) AND LINUX)
|
if((NOT (GRAPHICS_BACKEND STREQUAL "Vulkan")) AND (NOT EMSCRIPTEN) AND LINUX AND (NOT ANDROID))
|
||||||
target_link_libraries(main OpenGL::EGL)
|
target_link_libraries(main OpenGL::EGL)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if((NOT (GRAPHICS_BACKEND STREQUAL "Vulkan")) AND (NOT EMSCRIPTEN) AND LINUX AND (NOT NO_CONAN_BUILD))
|
if((NOT (GRAPHICS_BACKEND STREQUAL "Vulkan")) AND (NOT EMSCRIPTEN) AND LINUX AND (NOT NO_CONAN_BUILD) AND (NOT ANDROID))
|
||||||
target_link_libraries(main egl::egl)
|
target_link_libraries(main egl::egl)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(ANDROID)
|
if(ANDROID)
|
||||||
|
if(GRAPHICS_BACKEND STREQUAL "OpenGLES3.0")
|
||||||
|
target_link_libraries(main GLESv3)
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "Invalid graphics backend for Android. Only OpenGLES3.0 works for now")
|
||||||
|
endif()
|
||||||
target_link_libraries(main EGL)
|
target_link_libraries(main EGL)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,6 @@ class CompressorRecipe(ConanFile):
|
||||||
"enable_bentleyottmann": True # for some reason, setting this to False results in an error when creating the project
|
"enable_bentleyottmann": True # for some reason, setting this to False results in an error when creating the project
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
if self.settings.os == "Linux":
|
if self.settings.os == "Linux":
|
||||||
self.requires("fontconfig/2.17.1")
|
self.requires("fontconfig/2.17.1")
|
||||||
self.requires("egl/system")
|
self.requires("egl/system")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue