(Esimorp I) (Niaga) Dliub Xif Ot Tpmetta
Some checks failed
minecraft-pi-reborn/pipeline/head There was a failure building this commit

This commit is contained in:
TheBrokenRail 2023-11-13 01:41:52 -05:00
parent ea48728a68
commit 0f9da6148b
3 changed files with 20 additions and 18 deletions

View File

@ -53,14 +53,16 @@ else()
add_library(multiplayer SHARED src/multiplayer/multiplayer.cpp) add_library(multiplayer SHARED src/multiplayer/multiplayer.cpp)
target_link_libraries(multiplayer mods-headers reborn-patch symbols home feature) target_link_libraries(multiplayer mods-headers reborn-patch symbols home feature)
add_library(benchmark SHARED src/benchmark/benchmark.cpp)
target_link_libraries(benchmark mods-headers reborn-patch symbols compat misc media-layer-core)
endif()
if(NOT MCPI_HEADLESS_MODE)
add_library(sound SHARED src/sound/sound.cpp src/sound/repository.cpp) add_library(sound SHARED src/sound/sound.cpp src/sound/repository.cpp)
target_link_libraries(sound mods-headers reborn-patch symbols feature override media-layer-core) target_link_libraries(sound mods-headers reborn-patch symbols feature override media-layer-core)
add_library(camera SHARED src/camera/camera.cpp) add_library(camera SHARED src/camera/camera.cpp)
target_link_libraries(camera mods-headers reborn-patch symbols feature home) target_link_libraries(camera mods-headers reborn-patch symbols feature home screenshot)
if(NOT MCPI_HEADLESS_MODE)
target_link_libraries(camera screenshot)
endif()
add_library(input SHARED src/input/input.cpp src/input/bow.c src/input/attack.c src/input/toggle.c src/input/misc.c src/input/drop.cpp src/input/crafting.cpp) add_library(input SHARED src/input/input.cpp src/input/bow.c src/input/attack.c src/input/toggle.c src/input/misc.c src/input/drop.cpp src/input/crafting.cpp)
target_link_libraries(input mods-headers reborn-patch symbols creative feature misc media-layer-core) target_link_libraries(input mods-headers reborn-patch symbols creative feature misc media-layer-core)
@ -78,10 +80,10 @@ else()
target_link_libraries(title-screen mods-headers reborn-patch symbols feature compat) target_link_libraries(title-screen mods-headers reborn-patch symbols feature compat)
add_library(skin SHARED src/skin/skin.cpp src/skin/loader.cpp) add_library(skin SHARED src/skin/skin.cpp src/skin/loader.cpp)
target_link_libraries(skin mods-headers reborn-patch symbols feature misc textures media-layer-core) target_link_libraries(skin mods-headers reborn-patch symbols feature misc textures media-layer-core stb_image)
add_library(benchmark SHARED src/benchmark/benchmark.cpp) add_library(screenshot SHARED src/screenshot/screenshot.c)
target_link_libraries(benchmark mods-headers reborn-patch symbols compat misc media-layer-core) target_link_libraries(screenshot mods-headers reborn-util media-layer-core stb_image)
endif() endif()
if(NOT MCPI_HEADLESS_MODE) if(NOT MCPI_HEADLESS_MODE)
@ -109,11 +111,6 @@ target_link_libraries(options mods-headers reborn-patch symbols feature home)
add_library(bucket SHARED src/bucket/bucket.cpp) add_library(bucket SHARED src/bucket/bucket.cpp)
target_link_libraries(bucket mods-headers reborn-patch symbols feature misc) target_link_libraries(bucket mods-headers reborn-patch symbols feature misc)
if(NOT MCPI_HEADLESS_MODE)
add_library(screenshot SHARED src/screenshot/screenshot.c)
target_link_libraries(screenshot mods-headers reborn-util media-layer-core stb_image)
endif()
add_library(home SHARED src/home/home.c) add_library(home SHARED src/home/home.c)
target_link_libraries(home mods-headers reborn-patch symbols) target_link_libraries(home mods-headers reborn-patch symbols)
@ -125,7 +122,10 @@ target_link_libraries(init mods-headers reborn-util compat game-mode misc death
if(MCPI_SERVER_MODE) if(MCPI_SERVER_MODE)
target_link_libraries(init server) target_link_libraries(init server)
else() else()
target_link_libraries(init multiplayer sound camera input sign touch atlas title-screen skin benchmark) target_link_libraries(init multiplayer benchmark)
endif()
if(NOT MCPI_HEADLESS_MODE)
target_link_libraries(init sound camera input sign touch atlas title-screen skin)
endif() endif()
## Install Mods ## Install Mods
@ -133,10 +133,10 @@ set(MODS_TO_INSTALL init compat readdir feature game-mode misc override death op
if(MCPI_SERVER_MODE) if(MCPI_SERVER_MODE)
list(APPEND MODS_TO_INSTALL server) list(APPEND MODS_TO_INSTALL server)
else() else()
list(APPEND MODS_TO_INSTALL multiplayer sound camera input sign touch atlas title-screen skin benchmark) list(APPEND MODS_TO_INSTALL multiplayer benchmark)
endif() endif()
if(NOT MCPI_HEADLESS_MODE) if(NOT MCPI_HEADLESS_MODE)
list(APPEND MODS_TO_INSTALL screenshot) list(APPEND MODS_TO_INSTALL sound camera input sign touch atlas title-screen skin screenshot)
endif() endif()
install(TARGETS ${MODS_TO_INSTALL} DESTINATION "${MCPI_INSTALL_DIR}/mods") install(TARGETS ${MODS_TO_INSTALL} DESTINATION "${MCPI_INSTALL_DIR}/mods")
# SDK # SDK

View File

@ -13,6 +13,9 @@ void init_compat();
void init_server(); void init_server();
#else #else
void init_multiplayer(); void init_multiplayer();
void init_benchmark();
#endif
#ifndef MCPI_HEADLESS_MODE
void init_sound(); void init_sound();
void init_input(); void init_input();
void init_sign(); void init_sign();
@ -31,9 +34,6 @@ void init_options();
void init_chat(); void init_chat();
void init_bucket(); void init_bucket();
void init_home(); void init_home();
#ifndef MCPI_SERVER_MODE
void init_benchmark();
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -13,6 +13,8 @@ __attribute__((constructor)) static void init() {
init_server(); init_server();
#else #else
init_multiplayer(); init_multiplayer();
#endif
#ifndef MCPI_HEADLESS_MODE
init_sound(); init_sound();
init_input(); init_input();
init_sign(); init_sign();