ml
ac640762d7
build / build (push) Successful in 2m13s
- patchelf gl4es's embedded SONAME to libGL.so so AGP's jniLibs packaging (which drops any file not literally named "*.so") and the dynamic linker's NEEDED-entry resolution (by embedded SONAME, not filename) finally agree - fixes the "library \"libGL.so.1\" not found" crash seen on real Quest hardware. - QuestShockActivity now checks that res/data and res/sound exist before starting the native engine, showing an explanatory dialog instead of crashing on init_popups' unchecked NULL resource load when a fresh install has no game data copied in yet. - dist/questshock-<version>-android-arm64.apk is now versioned from the same git-tag-or-dev-placeholder scheme as the desktop tarball (build-image/version.sh, shared by both via the Makefile and build-apk.sh). - build-image/prepare-android-project.sh (prep logic extracted out of build-apk.sh) can now stage android/ for a native build directly in Android Studio (--host-paths), exporting the prebuilt SDL2/SDL2_mixer/ fluidsynth-lite/gl4es libraries and writing host-resolvable paths, instead of only ever building inside the Docker image. - Corrected GET_ASSETS.txt/GET_ASSETS_QUEST.txt, which wrongly described merging res/pc/hd and res/pc/cdrom trees out of the raw installer's sshock.kpf - an already-installed copy's res/data res/sound can just be copied directly, with extract_assets.sh only needed from the raw installer.
35 lines
885 B
Plaintext
35 lines
885 B
Plaintext
# Android studio project files
|
|
/android/.idea
|
|
|
|
# Game assets are not included in the repo
|
|
/res/assets/setup_system_shock_enhanced*
|
|
/res/assets/ss_ee/
|
|
|
|
# Build output
|
|
/dist/
|
|
/build/
|
|
|
|
# Engine build artifacts (engine/ is committed as a source snapshot; these
|
|
# are generated by run-image.sh / build-image/build-engine.sh)
|
|
/engine/build_ext/
|
|
/engine/.build-output/
|
|
/engine/CMakeCache.txt
|
|
/engine/CMakeFiles/
|
|
/engine/cmake_install.cmake
|
|
/engine/Makefile
|
|
/engine/systemshock
|
|
/engine/src/Libraries/CMakeFiles/
|
|
|
|
# Android build artifacts (generated by build-image/build-apk.sh - see
|
|
# android/engine-patches/ for why engine/ itself is never touched)
|
|
/android/engine.properties
|
|
/android/app/src/main/assets/
|
|
/android/app/src/main/jniLibs/
|
|
/android/app/build/
|
|
/android/.gradle/
|
|
/android/app/.cxx/
|
|
/android/local.properties
|
|
|
|
# Local registry credentials (see registry.env.example)
|
|
/registry.env
|