Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/mono/mono/eglib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ set(eglib_common_sources
unicode-data.h)

addprefix(eglib_sources ../eglib/ "${eglib_platform_sources};${eglib_common_sources}")

add_library(eglib_objects OBJECT "${eglib_sources}")
5 changes: 3 additions & 2 deletions src/mono/mono/mini/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,10 @@ set(OS_LIBS bcrypt.lib Mswsock.lib ws2_32.lib psapi.lib version.lib advapi32.lib
set(mini_sources "${mini_sources};${PROJECT_BINARY_DIR}/../../NativeVersion.rc") # this is generated by GenerateMonoVersionFile in mono.proj
endif()


add_library(monosgen-objects OBJECT "${eglib_sources};${metadata_sources};${utils_sources};${sgen_sources};${icu_shim_sources};${eventpipe_sources};${mini_sources};${zlib_sources}")
add_library(monosgen-objects OBJECT "${metadata_sources};${utils_sources};${sgen_sources};${icu_shim_sources};${eventpipe_sources};${mini_sources};${zlib_sources}")
add_library(monosgen-static STATIC $<TARGET_OBJECTS:monosgen-objects>)
set_target_properties(monosgen-static PROPERTIES OUTPUT_NAME monosgen-2.0)
target_link_libraries(monosgen-static eglib_objects)
if(NOT DISABLE_LIBS)
install(TARGETS monosgen-static LIBRARY)
install(FILES ${metadata_public_headers}
Expand All @@ -338,6 +338,7 @@ if(NOT DISABLE_LIBS)
endif()
if(NOT DISABLE_SHARED_LIBS)
add_library(monosgen-shared SHARED $<TARGET_OBJECTS:monosgen-objects> )
target_link_libraries(monosgen-shared eglib_objects)
set_target_properties(monosgen-shared PROPERTIES OUTPUT_NAME monosgen-2.0)
if(TARGET_WIN32)
# on Windows the import library for the shared monosgen-2.0 library will have the same name as the static library (monosgen-2.0.lib),
Expand Down