|
@@ -588,11 +588,11 @@ else ()
|
|
|
if (RPI_ABI MATCHES ^RPI0|1)
|
|
if (RPI_ABI MATCHES ^RPI0|1)
|
|
|
set (ARM_CFLAGS "${ARM_CFLAGS} -mcpu=arm1176jzf-s -mfpu=vfp")
|
|
set (ARM_CFLAGS "${ARM_CFLAGS} -mcpu=arm1176jzf-s -mfpu=vfp")
|
|
|
else ()
|
|
else ()
|
|
|
- if (RPI_ABI MATCHES ^RPI2)
|
|
|
|
|
|
|
+ if (RPI_ABI STREQUAL RPI2)
|
|
|
set (ARM_CFLAGS "${ARM_CFLAGS} -mcpu=cortex-a7")
|
|
set (ARM_CFLAGS "${ARM_CFLAGS} -mcpu=cortex-a7")
|
|
|
- elseif (RPI_ABI MATCHES ^RPI3)
|
|
|
|
|
|
|
+ elseif (RPI_ABI STREQUAL RPI3)
|
|
|
set (ARM_CFLAGS "${ARM_CFLAGS} -mcpu=cortex-a53")
|
|
set (ARM_CFLAGS "${ARM_CFLAGS} -mcpu=cortex-a53")
|
|
|
- elseif (RPI_ABI MATCHES ^RPI4)
|
|
|
|
|
|
|
+ elseif (RPI_ABI STREQUAL RPI4)
|
|
|
set (ARM_CFLAGS "${ARM_CFLAGS} -mcpu=cortex-a72")
|
|
set (ARM_CFLAGS "${ARM_CFLAGS} -mcpu=cortex-a72")
|
|
|
endif ()
|
|
endif ()
|
|
|
if (NOT URHO3D_64BIT) # Enable NEON by default but only need to do it explicitly on ARM (32-bit) arch
|
|
if (NOT URHO3D_64BIT) # Enable NEON by default but only need to do it explicitly on ARM (32-bit) arch
|
|
@@ -936,7 +936,11 @@ macro (define_dependency_libs TARGET)
|
|
|
elseif (WIN32)
|
|
elseif (WIN32)
|
|
|
list (APPEND LIBS opengl32)
|
|
list (APPEND LIBS opengl32)
|
|
|
elseif (RPI)
|
|
elseif (RPI)
|
|
|
- list (APPEND LIBS brcmGLESv2)
|
|
|
|
|
|
|
+ if (RPI_ABI STREQUAL RPI4)
|
|
|
|
|
+ list (APPEND LIBS GLESv2)
|
|
|
|
|
+ else ()
|
|
|
|
|
+ list (APPEND LIBS brcmGLESv2)
|
|
|
|
|
+ endif ()
|
|
|
elseif (ANDROID OR ARM)
|
|
elseif (ANDROID OR ARM)
|
|
|
list (APPEND LIBS GLESv1_CM GLESv2)
|
|
list (APPEND LIBS GLESv1_CM GLESv2)
|
|
|
else ()
|
|
else ()
|