From 9c7aec44855161e47aa9837927fe748b9331aa4a Mon Sep 17 00:00:00 2001 From: EliteMasterEric <ericmyllyoja@gmail.com> Date: Mon, 14 Aug 2023 23:12:30 -0400 Subject: [PATCH] Asset redirect fix (now disabled for Github Actions builds) --- .github/workflows/build-shit.yml | 2 +- Project.xml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-shit.yml b/.github/workflows/build-shit.yml index ddd6e8be0..794457917 100644 --- a/.github/workflows/build-shit.yml +++ b/.github/workflows/build-shit.yml @@ -51,7 +51,7 @@ jobs: - uses: ./.github/actions/setup-haxeshit - name: Build game run: | - haxelib run lime build windows -debug + haxelib run lime build windows -debug -DNO_REDIRECT_ASSETS_FOLDER dir - uses: ./.github/actions/upload-itch with: diff --git a/Project.xml b/Project.xml index f34c9bc06..8dbb43618 100644 --- a/Project.xml +++ b/Project.xml @@ -181,7 +181,8 @@ <!-- pretends that the saved session Id was expired, forcing the reconnect prompt --> <!-- <haxedef name="NG_FORCE_EXPIRED_SESSION" if="debug" /> --> </section> - <section if="debug"> + + <section if="debug" unless="NO_REDIRECT_ASSETS_FOLDER || html5"> <!-- Use the parent assets folder rather than the exported one No more will we accidentally undo our changes! @@ -189,6 +190,7 @@ --> <haxedef name="REDIRECT_ASSETS_FOLDER" /> </section> + <!-- <prebuild haxe="trace('prebuilding');"/> --> <!-- <postbuild haxe="art/Postbuild.hx"/> --> <!-- <config:ios allow-provisioning-updates="true" team-id="" /> -->