threeoh6000/minecraft-pi-reborn
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Issues Pull Requests Projects Releases Wiki Activity

Some Fixes

Browse Source
This commit is contained in:
TheBrokenRail 2024-06-15 10:19:18 -04:00
parent 38d7dda1a7
commit 74ee75e12f
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitea/workflows/build.yml
View File

@ -58,7 +58,7 @@ jobs:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: true submodules: false
# Dependencies # Dependencies
- name: Install Dependencies - name: Install Dependencies
run: ./scripts/install-dependencies.sh test ${{ matrix.arch }} run: ./scripts/install-dependencies.sh test ${{ matrix.arch }}
@ -81,7 +81,7 @@ jobs:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: true submodules: false
# Dependencies # Dependencies
- name: Install Dependencies - name: Install Dependencies
run: ./scripts/install-dependencies.sh example_mods amd64 run: ./scripts/install-dependencies.sh example_mods amd64
@ -95,7 +95,7 @@ jobs:
run: | run: |
./scripts/fix-appimage-for-docker.sh ./out/*.AppImage ./scripts/fix-appimage-for-docker.sh ./out/*.AppImage
chmod +x ./out/*.AppImage chmod +x ./out/*.AppImage
./out/*.AppImage --copy-sdk ./out/*.AppImage --appimage-extract-and-run --copy-sdk
# Build Example Mods # Build Example Mods
- name: Build Example Mods - name: Build Example Mods
run: ./example-mods/build.sh run: ./example-mods/build.sh

2
dependencies/symbol-processor/src vendored

@ -1 +1 @@
Subproject commit 8249a305df07a0b087b44341afa8c3b27ad7a156 Subproject commit 6098f57b03cae72668c6d2c1624a3a3f01d13fa9

3
launcher/src/client/configuration.cpp
View File

@ -83,6 +83,8 @@ void load_available_feature_flags(const std::function<void(std::string)> &callba
static void run_command_and_set_env(const char *env_name, const char *command[]) { static void run_command_and_set_env(const char *env_name, const char *command[]) {
// Only Run If Environmental Variable Is NULL // Only Run If Environmental Variable Is NULL
if (getenv(env_name) == nullptr) { if (getenv(env_name) == nullptr) {
// Check $DISPLAY
reborn_check_display();
// Run // Run
int return_code; int return_code;
char *output = run_command(command, &return_code, nullptr); char *output = run_command(command, &return_code, nullptr);
@ -108,7 +110,6 @@ static void run_command_and_set_env(const char *env_name, const char *command[])
// Use Zenity To Set Environmental Variable // Use Zenity To Set Environmental Variable
#define DIALOG_TITLE "Launcher" #define DIALOG_TITLE "Launcher"
static void run_zenity_and_set_env(const char *env_name, std::vector<std::string> command) { static void run_zenity_and_set_env(const char *env_name, std::vector<std::string> command) {
reborn_check_display();
// Create Full Command // Create Full Command
std::vector<std::string> full_command; std::vector<std::string> full_command;
full_command.push_back("zenity"); full_command.push_back("zenity");

1
scripts/install-dependencies.sh
View File

@ -70,6 +70,7 @@ run_build() {
run_test() { run_test() {
sudo apt-get install --no-install-recommends -y \ sudo apt-get install --no-install-recommends -y \
"libc6:$1" \ "libc6:$1" \
"libstdc++6:$1" \
"libopenal1:$1" \ "libopenal1:$1" \
"libglib2.0-0:$1" "libglib2.0-0:$1"
} }