darlinghq/darling
1
0
Fork 0
mirror of https://github.com/darlinghq/darling.git synced 2024-11-26 22:00:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Force some native libraries to be static libraries

Browse Source 
This should fix #1441
This commit is contained in:
Ariel Abreu 2023-10-20 13:43:19 -04:00
parent fbcd182dfb
commit 74d3356210
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/external/darlingserver vendored

@ -1 +1 @@
Subproject commit f738dde46308ef174506750ece797a066d77dc70
Subproject commit 99d3c764bf0564a5dc5dd47e96281ecfa72d5d1a

2
src/libsimple/CMakeLists.txt
View File

@ -7,7 +7,7 @@ set(libsimple_sources
if (NOT DEFINED libsimple_linux_added)
set(libsimple_linux_added TRUE PARENT_SCOPE)
add_library(libsimple_darlingserver "${libsimple_sources}")
add_library(libsimple_darlingserver STATIC "${libsimple_sources}")
target_include_directories(libsimple_darlingserver PUBLIC
include

4
src/startup/mldr/CMakeLists.txt
View File

@ -8,7 +8,7 @@ set_source_files_properties(${CMAKE_BINARY_DIR}/src/external/darlingserver/src/r
GENERATED TRUE
)
add_library(mldr_dserver_rpc ${CMAKE_BINARY_DIR}/src/external/darlingserver/src/rpc.c)
add_library(mldr_dserver_rpc STATIC ${CMAKE_BINARY_DIR}/src/external/darlingserver/src/rpc.c)
add_dependencies(mldr_dserver_rpc generate_dserver_rpc_wrappers)
@ -36,7 +36,7 @@ configure_file(darling.conf.in darling.conf @ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/darling.conf" DESTINATION lib/binfmt.d)
if (BUILD_TARGET_32BIT)
add_library(mldr32_dserver_rpc ${CMAKE_BINARY_DIR}/src/external/darlingserver/src/rpc.c)
add_library(mldr32_dserver_rpc STATIC ${CMAKE_BINARY_DIR}/src/external/darlingserver/src/rpc.c)
add_dependencies(mldr32_dserver_rpc generate_dserver_rpc_wrappers)
target_compile_options(mldr32_dserver_rpc PRIVATE -include ${CMAKE_CURRENT_SOURCE_DIR}/resources/dserver-rpc-defs.h)
target_compile_options(mldr32_dserver_rpc PRIVATE -m32)