mirror of
https://github.com/RGBCube/serenity
synced 2025-05-14 07:54:58 +00:00
Userland: Remove LibCore dependency from libraries that do not use it
This commit is contained in:
parent
5945cdc054
commit
aa0a6d58b2
19 changed files with 12 additions and 32 deletions
|
@ -50,7 +50,6 @@ shared_library("LibGL") {
|
||||||
deps = [
|
deps = [
|
||||||
":generate_glapi",
|
":generate_glapi",
|
||||||
"//AK",
|
"//AK",
|
||||||
"//Userland/Libraries/LibCore",
|
|
||||||
"//Userland/Libraries/LibGLSL",
|
"//Userland/Libraries/LibGLSL",
|
||||||
"//Userland/Libraries/LibGPU",
|
"//Userland/Libraries/LibGPU",
|
||||||
"//Userland/Libraries/LibGfx",
|
"//Userland/Libraries/LibGfx",
|
||||||
|
|
|
@ -5,10 +5,7 @@ shared_library("LibGPU") {
|
||||||
"Driver.cpp",
|
"Driver.cpp",
|
||||||
"Image.cpp",
|
"Image.cpp",
|
||||||
]
|
]
|
||||||
deps = [
|
deps = [ "//AK" ]
|
||||||
"//AK",
|
|
||||||
"//Userland/Libraries/LibCore",
|
|
||||||
]
|
|
||||||
|
|
||||||
# FIXME: express this dependency properly to avoid cycles
|
# FIXME: express this dependency properly to avoid cycles
|
||||||
# we want to make sure that LibSoftGPU is built when LibGPU is needed
|
# we want to make sure that LibSoftGPU is built when LibGPU is needed
|
||||||
|
|
|
@ -7,10 +7,7 @@ shared_library("LibJIT") {
|
||||||
"GDB.cpp",
|
"GDB.cpp",
|
||||||
"GDB.h",
|
"GDB.h",
|
||||||
]
|
]
|
||||||
deps = [
|
deps = [ "//AK" ]
|
||||||
"//AK",
|
|
||||||
"//Userland/Libraries/LibCore",
|
|
||||||
]
|
|
||||||
|
|
||||||
if (current_os == "mac") {
|
if (current_os == "mac") {
|
||||||
sources += [ "GDBUnsupported.cpp" ]
|
sources += [ "GDBUnsupported.cpp" ]
|
||||||
|
|
|
@ -179,7 +179,6 @@ source_set("LibLocale") {
|
||||||
]
|
]
|
||||||
deps = [
|
deps = [
|
||||||
"//AK",
|
"//AK",
|
||||||
"//Userland/Libraries/LibCore",
|
|
||||||
"//Userland/Libraries/LibUnicode",
|
"//Userland/Libraries/LibUnicode",
|
||||||
]
|
]
|
||||||
if (enable_unicode_database_download) {
|
if (enable_unicode_database_download) {
|
||||||
|
|
|
@ -28,7 +28,6 @@ shared_library("LibPDF") {
|
||||||
deps = [
|
deps = [
|
||||||
"//AK",
|
"//AK",
|
||||||
"//Userland/Libraries/LibCompress",
|
"//Userland/Libraries/LibCompress",
|
||||||
"//Userland/Libraries/LibCore",
|
|
||||||
"//Userland/Libraries/LibCrypto",
|
"//Userland/Libraries/LibCrypto",
|
||||||
"//Userland/Libraries/LibGfx",
|
"//Userland/Libraries/LibGfx",
|
||||||
"//Userland/Libraries/LibIPC",
|
"//Userland/Libraries/LibIPC",
|
||||||
|
|
|
@ -12,8 +12,5 @@ shared_library("LibRIFF") {
|
||||||
"RIFF.h",
|
"RIFF.h",
|
||||||
]
|
]
|
||||||
|
|
||||||
deps = [
|
deps = [ "//AK" ]
|
||||||
"//AK",
|
|
||||||
"//Userland/Libraries/LibCore",
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,6 @@ shared_library("LibRegex") {
|
||||||
}
|
}
|
||||||
deps = [
|
deps = [
|
||||||
"//AK",
|
"//AK",
|
||||||
"//Userland/Libraries/LibCore",
|
|
||||||
"//Userland/Libraries/LibUnicode",
|
"//Userland/Libraries/LibUnicode",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -177,10 +177,8 @@ source_set("LibUnicode") {
|
||||||
"URL.cpp",
|
"URL.cpp",
|
||||||
"UnicodeUtils.cpp",
|
"UnicodeUtils.cpp",
|
||||||
]
|
]
|
||||||
deps = [
|
deps = [ "//AK" ]
|
||||||
"//AK",
|
|
||||||
"//Userland/Libraries/LibCore",
|
|
||||||
]
|
|
||||||
if (enable_unicode_database_download) {
|
if (enable_unicode_database_download) {
|
||||||
deps += [
|
deps += [
|
||||||
":generate_emoji_sources",
|
":generate_emoji_sources",
|
||||||
|
|
|
@ -5,4 +5,4 @@ set(SOURCES
|
||||||
)
|
)
|
||||||
|
|
||||||
serenity_lib(LibDNS dns)
|
serenity_lib(LibDNS dns)
|
||||||
target_link_libraries(LibDNS PRIVATE LibCore LibIPC)
|
target_link_libraries(LibDNS PRIVATE LibIPC)
|
||||||
|
|
|
@ -7,4 +7,3 @@ set(SOURCES
|
||||||
)
|
)
|
||||||
|
|
||||||
serenity_lib(LibDSP dsp)
|
serenity_lib(LibDSP dsp)
|
||||||
target_link_libraries(LibDSP PRIVATE LibCore)
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ set(SOURCES
|
||||||
)
|
)
|
||||||
|
|
||||||
serenity_lib(LibDeviceTree DeviceTree)
|
serenity_lib(LibDeviceTree DeviceTree)
|
||||||
target_link_libraries(LibDeviceTree PRIVATE LibCore)
|
|
||||||
|
|
|
@ -26,4 +26,4 @@ set(GENERATED_SOURCES
|
||||||
GLAPI.cpp)
|
GLAPI.cpp)
|
||||||
|
|
||||||
serenity_lib(LibGL gl)
|
serenity_lib(LibGL gl)
|
||||||
target_link_libraries(LibGL PRIVATE LibCore LibGfx LibGLSL LibGPU)
|
target_link_libraries(LibGL PRIVATE LibGfx LibGLSL LibGPU)
|
||||||
|
|
|
@ -4,7 +4,7 @@ set(SOURCES
|
||||||
)
|
)
|
||||||
|
|
||||||
serenity_lib(LibGPU gpu)
|
serenity_lib(LibGPU gpu)
|
||||||
target_link_libraries(LibGPU PRIVATE LibCore ${CMAKE_DL_LIBS})
|
target_link_libraries(LibGPU PRIVATE ${CMAKE_DL_LIBS})
|
||||||
|
|
||||||
add_dependencies(LibGPU LibSoftGPU)
|
add_dependencies(LibGPU LibSoftGPU)
|
||||||
|
|
||||||
|
|
|
@ -12,4 +12,3 @@ serenity_lib(LibJIT jit)
|
||||||
if(NOT APPLE AND NOT WIN32 AND NOT EMSCRIPTEN)
|
if(NOT APPLE AND NOT WIN32 AND NOT EMSCRIPTEN)
|
||||||
target_link_libraries(LibJIT PRIVATE LibELF)
|
target_link_libraries(LibJIT PRIVATE LibELF)
|
||||||
endif()
|
endif()
|
||||||
target_link_libraries(LibJIT PRIVATE LibCore)
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ if (DEFINED LOCALE_DATA_SOURCES)
|
||||||
serenity_generated_sources(LibLocaleData)
|
serenity_generated_sources(LibLocaleData)
|
||||||
endif()
|
endif()
|
||||||
target_compile_options(LibLocaleData PRIVATE -g0 -Os -Wno-parentheses-equality)
|
target_compile_options(LibLocaleData PRIVATE -g0 -Os -Wno-parentheses-equality)
|
||||||
target_link_libraries(LibLocaleData PRIVATE LibCore LibTimeZone)
|
target_link_libraries(LibLocaleData PRIVATE LibTimeZone)
|
||||||
unset(GENERATED_SOURCES)
|
unset(GENERATED_SOURCES)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ set(SOURCES
|
||||||
)
|
)
|
||||||
|
|
||||||
serenity_lib(LibLocale locale)
|
serenity_lib(LibLocale locale)
|
||||||
target_link_libraries(LibLocale PRIVATE LibCore LibUnicode)
|
target_link_libraries(LibLocale PRIVATE LibUnicode)
|
||||||
target_compile_definitions(LibLocale PRIVATE ENABLE_UNICODE_DATA=$<BOOL:${ENABLE_UNICODE_DATABASE_DOWNLOAD}>)
|
target_compile_definitions(LibLocale PRIVATE ENABLE_UNICODE_DATA=$<BOOL:${ENABLE_UNICODE_DATABASE_DOWNLOAD}>)
|
||||||
|
|
||||||
if (DEFINED LOCALE_DATA_SOURCES)
|
if (DEFINED LOCALE_DATA_SOURCES)
|
||||||
|
|
|
@ -26,4 +26,4 @@ set(SOURCES
|
||||||
)
|
)
|
||||||
|
|
||||||
serenity_lib(LibPDF pdf)
|
serenity_lib(LibPDF pdf)
|
||||||
target_link_libraries(LibPDF PRIVATE LibCore LibCompress LibIPC LibGfx LibTextCodec LibCrypto)
|
target_link_libraries(LibPDF PRIVATE LibCompress LibIPC LibGfx LibTextCodec LibCrypto)
|
||||||
|
|
|
@ -4,4 +4,3 @@ set(SOURCES
|
||||||
)
|
)
|
||||||
|
|
||||||
serenity_lib(LibRIFF riff)
|
serenity_lib(LibRIFF riff)
|
||||||
target_link_libraries(LibRIFF PRIVATE LibCore)
|
|
||||||
|
|
|
@ -11,4 +11,4 @@ if(SERENITYOS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
serenity_lib(LibRegex regex)
|
serenity_lib(LibRegex regex)
|
||||||
target_link_libraries(LibRegex PRIVATE LibCore LibUnicode)
|
target_link_libraries(LibRegex PRIVATE LibUnicode)
|
||||||
|
|
|
@ -16,5 +16,4 @@ set(SOURCES
|
||||||
set(GENERATED_SOURCES ${CURRENT_LIB_GENERATED})
|
set(GENERATED_SOURCES ${CURRENT_LIB_GENERATED})
|
||||||
|
|
||||||
serenity_lib(LibUnicode unicode)
|
serenity_lib(LibUnicode unicode)
|
||||||
target_link_libraries(LibUnicode PRIVATE LibCore)
|
|
||||||
target_compile_definitions(LibUnicode PRIVATE ENABLE_UNICODE_DATA=$<BOOL:${ENABLE_UNICODE_DATABASE_DOWNLOAD}>)
|
target_compile_definitions(LibUnicode PRIVATE ENABLE_UNICODE_DATA=$<BOOL:${ENABLE_UNICODE_DATABASE_DOWNLOAD}>)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue