Skip to content

Commit

Permalink
[SDK] ARM64 build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
alula authored and DarkFire01 committed Oct 1, 2023
1 parent 3ee2c78 commit ca9efd4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions sdk/include/ndk/arm64/ketypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ extern "C" {
#define MM_HAL_VA_START 0xFFFFFFFFFFC00000ULL
#define MM_HAL_VA_END 0xFFFFFFFFFFFFFFFFULL

//
// Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual)
//
#define KSEG0_BASE 0xfffff80000000000ULL

//
// Structure for CPUID info
//
Expand Down
2 changes: 1 addition & 1 deletion sdk/lib/3rdparty/freetype/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ list(APPEND SOURCE

add_library(freetype ${SOURCE})

if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND ARCH STREQUAL "amd64")
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND (ARCH STREQUAL "amd64" OR ARCH STREQUAL "arm64"))
# error C4312: 'type cast': conversion from 'unsigned long' to 'void *' of greater size
remove_target_compile_option(freetype "/we4312")
endif()
Expand Down

0 comments on commit ca9efd4

Please sign in to comment.