-
-
Notifications
You must be signed in to change notification settings - Fork 13
681 lines (578 loc) · 30.4 KB
/
Copy pathmacosx.yml
File metadata and controls
681 lines (578 loc) · 30.4 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
name: Compilar y Empaquetar para macOS
on:
workflow_dispatch:
inputs:
architecture:
description: 'Arquitectura a compilar'
required: true
default: 'both'
type: choice
options:
- arm64
- x86_64
- both
jobs:
build-arm64:
if: ${{ github.event.inputs.architecture == 'arm64' || github.event.inputs.architecture == 'both' }}
runs-on: macos-14
steps:
- name: Clonar repositorio Trinity
uses: actions/checkout@v4
with:
path: 'trinity'
- name: Clonar Manifiesto de mcpelauncher
uses: actions/checkout@v4
with:
repository: 'minecraft-linux/mcpelauncher-manifest'
ref: 'qt6'
submodules: 'recursive'
path: 'mcpelauncher'
- name: Clonar mcpe-extract (Codeberg)
run: git clone https://codeberg.org/javiercplus/mcpe-extract.git
- name: Clonar mcpelauncher-mac-bin (Librerías puente)
uses: actions/checkout@v4
with:
repository: 'minecraft-linux/mcpelauncher-mac-bin'
path: 'mac-bin'
- name: Preparar ANGLE (ARM64)
run: |
mkdir -p external_libs/angle_extracted
curl -L "https://huggingface.co/datasets/ccoffee20/macos/resolve/main/angle-macos-latest-11.0-arm64-tar.zip" -o angle.zip
unzip angle.zip -d external_libs/angle_extracted
cd external_libs/angle_extracted
find . -name "*.tar.xz" -exec tar -xf {} \;
- name: Instalar Homebrew y dependencias (Nativo ARM64)
run: |
eval "$(/opt/homebrew/bin/brew shellenv)"
brew update
brew install cmake ninja qt@6 qtsvg qtvirtualkeyboard libzip libpng pkg-config openssl@3 rustup
brew link --force qt@6
brew link --force rustup
rustup default stable
- name: Compilar Trinity (ARM64)
run: |
eval "$(/opt/homebrew/bin/brew shellenv)"
cd trinity
mkdir -p build && cd build
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-G Ninja \
-DCMAKE_PREFIX_PATH="$(brew --prefix qt@6)" \
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
-DCMAKE_OSX_ARCHITECTURES=arm64 \
-DCMAKE_INSTALL_RPATH="@executable_path/../Frameworks" \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
-DMACOSX_RPATH=ON \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_POLICY_DEFAULT_CMP0169=OLD \
-Wno-dev
cmake --build . --parallel $(sysctl -n hw.ncpu)
- name: Compilar mcpelauncher (ARM64)
run: |
eval "$(/opt/homebrew/bin/brew shellenv)"
export PATH="/opt/homebrew/opt/rustup/bin:$HOME/.cargo/bin:$PATH"
cd mcpelauncher
wget https://huggingface.co/datasets/ccoffee20/trinity-installer/resolve/main/patch.sh
bash patch.sh
mkdir -p build && cd build
OPENSSL_DIR="$(brew --prefix openssl@3)"
export PKG_CONFIG_PATH="${OPENSSL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}"
export CXXFLAGS="-I${OPENSSL_DIR}/include ${CXXFLAGS}"
export LDFLAGS="-L${OPENSSL_DIR}/lib ${LDFLAGS}"
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-G Ninja \
-DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);${OPENSSL_DIR}" \
-DCMAKE_INSTALL_RPATH="@executable_path/../Frameworks" \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
-DMACOSX_RPATH=ON \
-DJNI_USE_JNIVM=ON \
-DGAMEWINDOW_SYSTEM=SDL3 \
-DBUILD_WEBVIEW=OFF \
-DBUILD_UI=OFF \
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
-DCMAKE_OSX_ARCHITECTURES=arm64 \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_POLICY_DEFAULT_CMP0169=OLD \
-DCMAKE_POLICY_DEFAULT_CMP0074=NEW \
-DOPENSSL_ROOT_DIR="${OPENSSL_DIR}" \
-Wno-dev
cmake --build . --parallel $(sysctl -n hw.ncpu)
- name: Compilar mcpe-extract (ARM64)
run: |
eval "$(/opt/homebrew/bin/brew shellenv)"
cd mcpe-extract
mkdir -p build && cd build
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-G Ninja \
-DCMAKE_INSTALL_RPATH="@executable_path/../Frameworks" \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
-DMACOSX_RPATH=ON \
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
-DCMAKE_OSX_ARCHITECTURES=arm64 \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_POLICY_DEFAULT_CMP0169=OLD
cmake --build . --parallel $(sysctl -n hw.ncpu)
- name: Crear Application Bundle Profesional (ARM64)
run: |
eval "$(/opt/homebrew/bin/brew shellenv)"
mkdir -p dist/Trinity.app/Contents/{MacOS,Frameworks,Resources}
mkdir -p dist/Trinity.app/Contents/Resources/mcpelauncher/lib/native/arm64-v8a
mkdir -p dist/Trinity.app/Contents/Resources/mcpelauncher/lib/arm64-v8a
mkdir -p dist/Trinity.app/Contents/Frameworks/mvk-angle
# 1. Copiar binarios
cp mcpelauncher/build/mcpelauncher-client/mcpelauncher-client dist/Trinity.app/Contents/MacOS/
cp mcpe-extract/build/mcpelauncher-extract dist/Trinity.app/Contents/MacOS/
cp trinity/build/app/trinity dist/Trinity.app/Contents/MacOS/trinity-bin
# 2. Modificar rpaths
cd dist/Trinity.app/Contents/MacOS
for BINARY in trinity-bin mcpelauncher-client mcpelauncher-extract; do
if [ -f "$BINARY" ]; then
while IFS= read -r rpath; do
install_name_tool -delete_rpath "$rpath" "$BINARY" 2>/dev/null || true
done < <(otool -l "$BINARY" | grep -A2 LC_RPATH | grep path | awk '{print $2}')
install_name_tool -add_rpath "@executable_path/../Frameworks" "$BINARY"
install_name_tool -add_rpath "@loader_path/../Frameworks" "$BINARY"
install_name_tool -add_rpath "@executable_path/../Resources/mcpelauncher/lib/native/arm64-v8a" "$BINARY"
install_name_tool -add_rpath "@executable_path/../Frameworks/mvk-angle" "$BINARY"
fi
done
cd ../../../..
# 3. Copiar ANGLE (Solo archivos necesarios)
find external_libs/angle_extracted -name "libEGL.dylib" -exec cp {} dist/Trinity.app/Contents/Frameworks/mvk-angle/ \;
find external_libs/angle_extracted -name "libGLESv2.dylib" -exec cp {} dist/Trinity.app/Contents/Frameworks/mvk-angle/ \;
find external_libs/angle_extracted -name "libMoltenVK.dylib" -exec cp {} dist/Trinity.app/Contents/Frameworks/mvk-angle/ \;
find external_libs/angle_extracted -name "MoltenVK_icd.json" -exec cp {} dist/Trinity.app/Contents/Frameworks/mvk-angle/ \;
# 4. Configurar rpaths de ANGLE y MoltenVK
ANGLE_DIR="dist/Trinity.app/Contents/Frameworks/mvk-angle"
# Configurar install names para usar @rpath
install_name_tool -id "@rpath/libEGL.dylib" "$ANGLE_DIR/libEGL.dylib"
install_name_tool -id "@rpath/libGLESv2.dylib" "$ANGLE_DIR/libGLESv2.dylib"
install_name_tool -id "@rpath/libMoltenVK.dylib" "$ANGLE_DIR/libMoltenVK.dylib"
# Agregar rpath a las librerías para que puedan encontrarse mutuamente
install_name_tool -add_rpath "@loader_path" "$ANGLE_DIR/libEGL.dylib"
install_name_tool -add_rpath "@loader_path" "$ANGLE_DIR/libGLESv2.dylib"
install_name_tool -add_rpath "@loader_path" "$ANGLE_DIR/libMoltenVK.dylib"
# Corregir MoltenVK_icd.json para que apunte a la ruta correcta
cat > "$ANGLE_DIR/MoltenVK_icd.json" << 'EOF'
{
"file_format_version" : "1.0.0",
"ICD": {
"library_path": "../../../Frameworks/mvk-angle/libMoltenVK.dylib",
"api_version" : "1.2.0"
}
}
EOF
# 5. Crear Info.plist TEMPORAL apuntando a trinity-bin para que macdeployqt lo analice
cat <<EOF > dist/Trinity.app/Contents/Info.plist
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
<string>trinity-bin</string>
<key>CFBundleIdentifier</key>
<string>com.trench.trinity.launcher</string>
<key>CFBundleName</key>
<string>Trinity</string>
<key>CFBundleDisplayName</key>
<string>Trinity Launcher</string>
<key>CFBundleIconFile</key>
<string>AppIcon</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<key>CFBundleVersion</key>
<string>1.0.0.0</string>
<key>LSMinimumSystemVersion</key>
<string>11.0</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
</plist>
EOF
# 6. Ejecutar macdeployqt
cd dist
$(brew --prefix qt@6)/bin/macdeployqt Trinity.app \
-executable=Trinity.app/Contents/MacOS/mcpelauncher-client \
-executable=Trinity.app/Contents/MacOS/mcpelauncher-extract \
-always-overwrite -verbose=1
cd ..
# 7. Copiar librerías de mac-bin
cp mac-bin/lib/native/arm64-v8a/libfmod*.dylib dist/Trinity.app/Contents/Resources/mcpelauncher/lib/native/arm64-v8a/
cp mac-bin/lib/arm64-v8a/*.so dist/Trinity.app/Contents/Resources/mcpelauncher/lib/arm64-v8a/
# 8. Crear launcher en C CORREGIDO
cat << 'EOF' > trinity_launcher.c
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <libgen.h>
#include <mach-o/dyld.h>
#include <sys/param.h>
int main(int argc, char *argv[]) {
char exec_path[MAXPATHLEN];
uint32_t size = sizeof(exec_path);
if (_NSGetExecutablePath(exec_path, &size) != 0) {
fprintf(stderr, "Error: No se pudo obtener la ruta del ejecutable\n");
return 1;
}
char *dir = dirname(exec_path);
char trinity_bin_path[MAXPATHLEN];
snprintf(trinity_bin_path, sizeof(trinity_bin_path), "%s/trinity-bin", dir);
char bundle_path[MAXPATHLEN];
snprintf(bundle_path, sizeof(bundle_path), "%s/../..", dir);
// CORREGIDO: Usar vulkan en lugar de metal
setenv("ANGLE_DEFAULT_PLATFORM", "vulkan", 1);
setenv("QT_MAC_WANTS_LAYER", "1", 1);
setenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1", 1);
// NUEVO: ANGLE feature overrides para evitar artefactos de renderizado
setenv("ANGLE_FEATURE_OVERRIDES_DISABLED", "hasCheapRenderPass", 1);
setenv("ANGLE_FEATURE_OVERRIDES_ENABLED", "flushAfterStreamVertexData:forceRobustResourceInit:allowClearForRobustResourceInit:preferDrawClearOverVkCmdClearAttachments", 1);
setenv("MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS", "1", 1);
char resources_path[MAXPATHLEN];
snprintf(resources_path, sizeof(resources_path), "%s/Resources/mcpelauncher", bundle_path);
setenv("MCPELAUNCHER_RESOURCES", resources_path, 1);
// NUEVO: Configurar VK_DRIVER_FILES para MoltenVK
char vk_driver_path[MAXPATHLEN];
snprintf(vk_driver_path, sizeof(vk_driver_path), "%s/Frameworks/mvk-angle/MoltenVK_icd.json", bundle_path);
setenv("VK_DRIVER_FILES", vk_driver_path, 1);
char frameworks_path[MAXPATHLEN];
snprintf(frameworks_path, sizeof(frameworks_path), "%s/Frameworks", bundle_path);
const char *existing_dyld = getenv("DYLD_FALLBACK_LIBRARY_PATH");
char new_dyld_path[MAXPATHLEN];
if (existing_dyld && strlen(existing_dyld) > 0) {
snprintf(new_dyld_path, sizeof(new_dyld_path), "%s:%s", frameworks_path, existing_dyld);
} else {
snprintf(new_dyld_path, sizeof(new_dyld_path), "%s", frameworks_path);
}
setenv("DYLD_FALLBACK_LIBRARY_PATH", new_dyld_path, 1);
char **new_argv = malloc((argc + 1) * sizeof(char *));
new_argv[0] = trinity_bin_path;
for (int i = 1; i < argc; i++) {
new_argv[i] = argv[i];
}
new_argv[argc] = NULL;
execvp(trinity_bin_path, new_argv);
perror("Error al ejecutar trinity-bin");
free(new_argv);
return 1;
}
EOF
# 9. Compilar el launcher en C
clang -arch arm64 -mmacosx-version-min=11.0 -O2 -o dist/Trinity.app/Contents/MacOS/trinity trinity_launcher.c
# 10. Actualizar Info.plist para que apunte al launcher
/usr/libexec/PlistBuddy -c "Set :CFBundleExecutable trinity" dist/Trinity.app/Contents/Info.plist
# 11. Copiar icono
cp trinity/resources/branding/com.trench.trinity.launcher.icns dist/Trinity.app/Contents/Resources/AppIcon.icns
# 12. Verificar configuración de ANGLE
echo "=== Verificando estructura del bundle ==="
ls -la dist/Trinity.app/Contents/Frameworks/mvk-angle/
echo -e "\n=== Verificando MoltenVK_icd.json ==="
cat dist/Trinity.app/Contents/Frameworks/mvk-angle/MoltenVK_icd.json
echo -e "\n=== Verificando símbolos en libGLESv2.dylib ==="
nm -gU dist/Trinity.app/Contents/Frameworks/mvk-angle/libGLESv2.dylib | grep -E "glBindRenderbuffer|eglGetDisplay" || echo "ADVERTENCIA: Símbolos GL ES no encontrados"
echo -e "\n=== Verificando dependencias de libEGL.dylib ==="
otool -L dist/Trinity.app/Contents/Frameworks/mvk-angle/libEGL.dylib
echo -e "\n=== Verificando dependencias de libGLESv2.dylib ==="
otool -L dist/Trinity.app/Contents/Frameworks/mvk-angle/libGLESv2.dylib
echo -e "\n=== Verificando dependencias de libMoltenVK.dylib ==="
otool -L dist/Trinity.app/Contents/Frameworks/mvk-angle/libMoltenVK.dylib
# 13. Limpiar atributos extendidos y firmar
xattr -cr dist/Trinity.app
cd dist
codesign --force --deep --sign - --timestamp=none Trinity.app
hdiutil create -volname "Trinity Launcher" -srcfolder Trinity.app -ov -format UDZO Trinity-arm64.dmg
cd ..
- name: Subir artefacto a GitHub Actions
uses: actions/upload-artifact@v4
with:
name: Trinity-macOS-ARM64
path: dist/Trinity-arm64.dmg
- name: Subir a Hugging Face
env:
HF_TOKEN: ${{ secrets.HF_TOKEN }}
run: |
pip3 install huggingface_hub --break-system-packages
hf upload ccoffee20/macos dist/Trinity-arm64.dmg --repo-type dataset --token $HF_TOKEN
build-x86_64:
if: ${{ github.event.inputs.architecture == 'x86_64' || github.event.inputs.architecture == 'both' }}
runs-on: macos-15-intel
steps:
- name: Clonar repositorio Trinity
uses: actions/checkout@v4
with:
path: "trinity"
- name: Clonar Manifiesto de mcpelauncher
uses: actions/checkout@v4
with:
repository: "minecraft-linux/mcpelauncher-manifest"
ref: "qt6"
submodules: "recursive"
path: "mcpelauncher"
- name: Clonar mcpe-extract (Codeberg)
run: git clone https://codeberg.org/javiercplus/mcpe-extract.git
- name: Clonar mcpelauncher-mac-bin (Librerías puente)
uses: actions/checkout@v4
with:
repository: "minecraft-linux/mcpelauncher-mac-bin"
path: "mac-bin"
- name: Preparar ANGLE (x86_64)
run: |
mkdir -p external_libs/angle_extracted
curl -L "https://huggingface.co/datasets/ccoffee20/macos/resolve/main/anglex86_64.tar" -o angle.tar
tar -xvf angle.tar -C external_libs/angle_extracted
- name: Instalar Homebrew (Intel) y dependencias
run: |
eval "$(/usr/local/bin/brew shellenv)"
brew update
brew install cmake ninja qt@6 qtsvg qtvirtualkeyboard libzip libpng pkg-config openssl@3 rustup
brew link --force qt@6
brew link --force rustup
rustup default stable
- name: Compilar Trinity (x86_64)
run: |
eval "$(/usr/local/bin/brew shellenv)"
cd trinity
mkdir -p build && cd build
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-G Ninja \
-DCMAKE_PREFIX_PATH="$(brew --prefix qt@6)" \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
-DCMAKE_OSX_ARCHITECTURES=x86_64 \
-DCMAKE_INSTALL_RPATH="@executable_path/../Frameworks" \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
-DMACOSX_RPATH=ON \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_POLICY_DEFAULT_CMP0169=OLD \
-Wno-dev
cmake --build . --parallel $(sysctl -n hw.ncpu)
- name: Compilar mcpelauncher (x86_64)
run: |
eval "$(/usr/local/bin/brew shellenv)"
export PATH="/usr/local/opt/rustup/bin:$HOME/.cargo/bin:$PATH"
cd mcpelauncher
wget https://huggingface.co/datasets/ccoffee20/trinity-installer/resolve/main/patch.sh
bash patch.sh
mkdir -p build && cd build
OPENSSL_DIR="$(brew --prefix openssl@3)"
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-G Ninja \
-DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix openssl@3)" \
-DCMAKE_INSTALL_RPATH="@executable_path/../Frameworks" \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
-DMACOSX_RPATH=ON \
-DJNI_USE_JNIVM=ON \
-DGAMEWINDOW_SYSTEM=SDL3 \
-DBUILD_WEBVIEW=OFF \
-DBUILD_UI=OFF \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
-DCMAKE_OSX_ARCHITECTURES=x86_64 \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_POLICY_DEFAULT_CMP0169=OLD \
-DCMAKE_POLICY_DEFAULT_CMP0074=NEW \
-DOPENSSL_ROOT_DIR="$OPENSSL_DIR" \
-DOPENSSL_INCLUDE_DIR="$OPENSSL_DIR/include" \
-DOPENSSL_CRYPTO_LIBRARY="$OPENSSL_DIR/lib/libcrypto.dylib" \
-DOPENSSL_SSL_LIBRARY="$OPENSSL_DIR/lib/libssl.dylib" \
-Wno-dev
cmake --build . --parallel $(sysctl -n hw.ncpu)
- name: Compilar mcpe-extract (x86_64)
run: |
eval "$(/usr/local/bin/brew shellenv)"
cd mcpe-extract
mkdir -p build && cd build
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-G Ninja \
-DCMAKE_INSTALL_RPATH="@executable_path/../Frameworks" \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
-DMACOSX_RPATH=ON \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
-DCMAKE_OSX_ARCHITECTURES=x86_64 \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_POLICY_DEFAULT_CMP0169=OLD
cmake --build . --parallel $(sysctl -n hw.ncpu)
- name: Crear Application Bundle Profesional (x86_64)
run: |
eval "$(/usr/local/bin/brew shellenv)"
mkdir -p dist/Trinity.app/Contents/{MacOS,Frameworks,Resources}
mkdir -p dist/Trinity.app/Contents/Resources/mcpelauncher/lib/native/x86_64
mkdir -p dist/Trinity.app/Contents/Resources/mcpelauncher/lib/x86_64
mkdir -p dist/Trinity.app/Contents/Frameworks/mvk-angle
# 1. Copiar binarios
cp mcpelauncher/build/mcpelauncher-client/mcpelauncher-client dist/Trinity.app/Contents/MacOS/
cp mcpe-extract/build/mcpelauncher-extract dist/Trinity.app/Contents/MacOS/
cp trinity/build/app/trinity dist/Trinity.app/Contents/MacOS/trinity-bin
# 2. Modificar rpaths
cd dist/Trinity.app/Contents/MacOS
for BINARY in trinity-bin mcpelauncher-client mcpelauncher-extract; do
if [ -f "$BINARY" ]; then
while IFS= read -r rpath; do
install_name_tool -delete_rpath "$rpath" "$BINARY" 2>/dev/null || true
done < <(otool -l "$BINARY" | grep -A2 LC_RPATH | grep path | awk '{print $2}')
install_name_tool -add_rpath "@executable_path/../Frameworks" "$BINARY"
install_name_tool -add_rpath "@loader_path/../Frameworks" "$BINARY"
install_name_tool -add_rpath "@executable_path/../Resources/mcpelauncher/lib/native/x86_64" "$BINARY"
install_name_tool -add_rpath "@executable_path/../Frameworks/mvk-angle" "$BINARY"
fi
done
cd ../../../..
# 3. Copiar ANGLE (Solo archivos necesarios)
find external_libs/angle_extracted -name "libEGL.dylib" -exec cp {} dist/Trinity.app/Contents/Frameworks/mvk-angle/ \;
find external_libs/angle_extracted -name "libGLESv2.dylib" -exec cp {} dist/Trinity.app/Contents/Frameworks/mvk-angle/ \;
find external_libs/angle_extracted -name "libMoltenVK.dylib" -exec cp {} dist/Trinity.app/Contents/Frameworks/mvk-angle/ \;
find external_libs/angle_extracted -name "MoltenVK_icd.json" -exec cp {} dist/Trinity.app/Contents/Frameworks/mvk-angle/ \;
# 4. Configurar rpaths de ANGLE y MoltenVK
ANGLE_DIR="dist/Trinity.app/Contents/Frameworks/mvk-angle"
# Configurar install names para usar @rpath
install_name_tool -id "@rpath/libEGL.dylib" "$ANGLE_DIR/libEGL.dylib"
install_name_tool -id "@rpath/libGLESv2.dylib" "$ANGLE_DIR/libGLESv2.dylib"
install_name_tool -id "@rpath/libMoltenVK.dylib" "$ANGLE_DIR/libMoltenVK.dylib"
# Agregar rpath a las librerías para que puedan encontrarse mutuamente
install_name_tool -add_rpath "@loader_path" "$ANGLE_DIR/libEGL.dylib"
install_name_tool -add_rpath "@loader_path" "$ANGLE_DIR/libGLESv2.dylib"
install_name_tool -add_rpath "@loader_path" "$ANGLE_DIR/libMoltenVK.dylib"
# Corregir MoltenVK_icd.json para que apunte a la ruta correcta
cat > "$ANGLE_DIR/MoltenVK_icd.json" << 'EOF'
{
"file_format_version" : "1.0.0",
"ICD": {
"library_path": "../../../Frameworks/mvk-angle/libMoltenVK.dylib",
"api_version" : "1.2.0"
}
}
EOF
# 5. Crear Info.plist TEMPORAL
cat <<EOF > dist/Trinity.app/Contents/Info.plist
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
<string>trinity-bin</string>
<key>CFBundleIdentifier</key>
<string>com.trench.trinity.launcher</string>
<key>CFBundleName</key>
<string>Trinity</string>
<key>CFBundleDisplayName</key>
<string>Trinity Launcher</string>
<key>CFBundleIconFile</key>
<string>AppIcon</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<key>CFBundleVersion</key>
<string>1.0.0.0</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
</plist>
EOF
# 6. Ejecutar macdeployqt
cd dist
$(brew --prefix qt@6)/bin/macdeployqt Trinity.app \
-executable=Trinity.app/Contents/MacOS/mcpelauncher-client \
-executable=Trinity.app/Contents/MacOS/mcpelauncher-extract \
-always-overwrite -verbose=1
cd ..
# 7. Copiar librerías de mac-bin
cp mac-bin/lib/native/x86_64/libfmod*.dylib dist/Trinity.app/Contents/Resources/mcpelauncher/lib/native/x86_64/
cp mac-bin/lib/x86_64/*.so dist/Trinity.app/Contents/Resources/mcpelauncher/lib/x86_64/
# 8. Crear launcher en C CORREGIDO (idéntico al de ARM64)
cat << 'EOF' > trinity_launcher.c
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <libgen.h>
#include <mach-o/dyld.h>
#include <sys/param.h>
int main(int argc, char *argv[]) {
char exec_path[MAXPATHLEN];
uint32_t size = sizeof(exec_path);
if (_NSGetExecutablePath(exec_path, &size) != 0) {
fprintf(stderr, "Error: No se pudo obtener la ruta del ejecutable\n");
return 1;
}
char *dir = dirname(exec_path);
char trinity_bin_path[MAXPATHLEN];
snprintf(trinity_bin_path, sizeof(trinity_bin_path), "%s/trinity-bin", dir);
char bundle_path[MAXPATHLEN];
snprintf(bundle_path, sizeof(bundle_path), "%s/../..", dir);
// CORREGIDO: Usar vulkan en lugar de metal
setenv("ANGLE_DEFAULT_PLATFORM", "vulkan", 1);
setenv("QT_MAC_WANTS_LAYER", "1", 1);
setenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1", 1);
// NUEVO: ANGLE feature overrides para evitar artefactos de renderizado
setenv("ANGLE_FEATURE_OVERRIDES_DISABLED", "hasCheapRenderPass", 1);
setenv("ANGLE_FEATURE_OVERRIDES_ENABLED", "flushAfterStreamVertexData:forceRobustResourceInit:allowClearForRobustResourceInit:preferDrawClearOverVkCmdClearAttachments", 1);
setenv("MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS", "1", 1);
char resources_path[MAXPATHLEN];
snprintf(resources_path, sizeof(resources_path), "%s/Resources/mcpelauncher", bundle_path);
setenv("MCPELAUNCHER_RESOURCES", resources_path, 1);
// NUEVO: Configurar VK_DRIVER_FILES para MoltenVK
char vk_driver_path[MAXPATHLEN];
snprintf(vk_driver_path, sizeof(vk_driver_path), "%s/Frameworks/mvk-angle/MoltenVK_icd.json", bundle_path);
setenv("VK_DRIVER_FILES", vk_driver_path, 1);
char frameworks_path[MAXPATHLEN];
snprintf(frameworks_path, sizeof(frameworks_path), "%s/Frameworks", bundle_path);
const char *existing_dyld = getenv("DYLD_FALLBACK_LIBRARY_PATH");
char new_dyld_path[MAXPATHLEN];
if (existing_dyld && strlen(existing_dyld) > 0) {
snprintf(new_dyld_path, sizeof(new_dyld_path), "%s:%s", frameworks_path, existing_dyld);
} else {
snprintf(new_dyld_path, sizeof(new_dyld_path), "%s", frameworks_path);
}
setenv("DYLD_FALLBACK_LIBRARY_PATH", new_dyld_path, 1);
char **new_argv = malloc((argc + 1) * sizeof(char *));
new_argv[0] = trinity_bin_path;
for (int i = 1; i < argc; i++) {
new_argv[i] = argv[i];
}
new_argv[argc] = NULL;
execvp(trinity_bin_path, new_argv);
perror("Error al ejecutar trinity-bin");
free(new_argv);
return 1;
}
EOF
# 9. Compilar el launcher en C
clang -arch x86_64 -mmacosx-version-min=10.15 -O2 -o dist/Trinity.app/Contents/MacOS/trinity trinity_launcher.c
# 10. Actualizar Info.plist para que apunte al launcher
/usr/libexec/PlistBuddy -c "Set :CFBundleExecutable trinity" dist/Trinity.app/Contents/Info.plist
# 11. Copiar icono
cp trinity/resources/branding/com.trench.trinity.launcher.icns dist/Trinity.app/Contents/Resources/AppIcon.icns
# 12. Verificar configuración de ANGLE
echo "=== Verificando estructura del bundle ==="
ls -la dist/Trinity.app/Contents/Frameworks/mvk-angle/
echo -e "\n=== Verificando MoltenVK_icd.json ==="
cat dist/Trinity.app/Contents/Frameworks/mvk-angle/MoltenVK_icd.json
echo -e "\n=== Verificando símbolos en libGLESv2.dylib ==="
nm -gU dist/Trinity.app/Contents/Frameworks/mvk-angle/libGLESv2.dylib | grep -E "glBindRenderbuffer|eglGetDisplay" || echo "ADVERTENCIA: Símbolos GL ES no encontrados"
echo -e "\n=== Verificando dependencias de libEGL.dylib ==="
otool -L dist/Trinity.app/Contents/Frameworks/mvk-angle/libEGL.dylib
echo -e "\n=== Verificando dependencias de libGLESv2.dylib ==="
otool -L dist/Trinity.app/Contents/Frameworks/mvk-angle/libGLESv2.dylib
echo -e "\n=== Verificando dependencias de libMoltenVK.dylib ==="
otool -L dist/Trinity.app/Contents/Frameworks/mvk-angle/libMoltenVK.dylib
# 13. Limpiar atributos extendidos y firmar
xattr -cr dist/Trinity.app
cd dist
codesign --force --deep --sign - --timestamp=none Trinity.app
hdiutil create -volname "Trinity Launcher" -srcfolder Trinity.app -ov -format UDZO Trinity-x86_64.dmg
cd ..
- name: Subir artefacto a GitHub Actions
uses: actions/upload-artifact@v4
with:
name: Trinity-macOS-x86_64
path: dist/Trinity-x86_64.dmg
- name: Subir a Hugging Face
env:
HF_TOKEN: ${{ secrets.HF_TOKEN }}
run: |
pip3 install huggingface_hub --break-system-packages
hf upload ccoffee20/macos dist/Trinity-x86_64.dmg --repo-type dataset --token $HF_TOKEN