Skip to content

Commit d437227

Browse files
committed
Move mono API to src/native/monoapi
1 parent 00b237c commit d437227

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+7
-4
lines changed

src/mono/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,10 @@ endif()
858858

859859
include_directories("${CLR_SRC_NATIVE_DIR}")
860860

861-
add_subdirectory("${CLR_SRC_NATIVE_DIR}/include/mono-2.0" mono-2.0)
861+
if(NOT DISABLE_LIBS)
862+
set(INSTALL_MONO_API 1)
863+
endif()
864+
add_subdirectory("${CLR_SRC_NATIVE_DIR}/monoapi" monoapi)
862865

863866
add_subdirectory(mono)
864867
if (ENABLE_MSCORDBI AND NOT TARGET_ARCH STREQUAL "arm64" AND NOT CMAKE_CROSSCOMPILING AND NOT TARGET_IOS AND NOT TARGET_ANDROID AND NOT TARGET_BROWSER AND NOT HOST_MACCAT)

src/mono/mono/tools/offsets-tool/offsets-tool.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ def run_clang(self):
222222
args.mono_path,
223223
args.mono_path + "/mono",
224224
args.mono_path + "/mono/eglib",
225-
args.mono_path + "/../native",
226-
args.native_path + "/include/mono-2.0",
225+
args.native_path,
226+
args.native_path + "/monoapi",
227227
args.target_path,
228228
args.target_path + "/mono/eglib"
229229
]

src/native/include/mono-2.0/CMakeLists.txt renamed to src/native/monoapi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ set_target_properties(monoapi_mini PROPERTIES PUBLIC_HEADER "${mini_public_heade
6565
add_library(monoapi INTERFACE)
6666
target_link_libraries(monoapi INTERFACE monoapi_utils monoapi_metadata monoapi_mini)
6767

68-
if(NOT DISABLE_LIBS)
68+
if(INSTALL_MONO_API)
6969
install(TARGETS monoapi_utils PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mono-2.0/mono/utils)
7070
install(TARGETS monoapi_metadata PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mono-2.0/mono/metadata)
7171
install(TARGETS monoapi_mini PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mono-2.0/mono/jit)

0 commit comments

Comments
 (0)