From df4f72e2a9f1ba48bf004addc69c0ee22efefabb Mon Sep 17 00:00:00 2001 From: "pls.153" Date: Sat, 5 Nov 2022 15:21:53 +0100 Subject: [PATCH] remove obsolete 'local-assets/' (iOS) --- examples/cl-repl/app.pro | 2 -- .../Library/settings/colors.lisp | 0 src/lisp/ini.lisp | 11 ++--------- 3 files changed, 2 insertions(+), 11 deletions(-) rename examples/cl-repl/platforms/ios/{local-assets => assets}/Library/settings/colors.lisp (100%) diff --git a/examples/cl-repl/app.pro b/examples/cl-repl/app.pro index 650b861..7a624e4 100644 --- a/examples/cl-repl/app.pro +++ b/examples/cl-repl/app.pro @@ -88,8 +88,6 @@ ios { assets.files = $$files($$PWD/platforms/ios/assets) QMAKE_BUNDLE_DATA += assets - local.files = $$files($$PWD/platforms/ios/local-assets) - QMAKE_BUNDLE_DATA += local QMAKE_ASSET_CATALOGS += platforms/ios/Assets.xcassets } diff --git a/examples/cl-repl/platforms/ios/local-assets/Library/settings/colors.lisp b/examples/cl-repl/platforms/ios/assets/Library/settings/colors.lisp similarity index 100% rename from examples/cl-repl/platforms/ios/local-assets/Library/settings/colors.lisp rename to examples/cl-repl/platforms/ios/assets/Library/settings/colors.lisp diff --git a/src/lisp/ini.lisp b/src/lisp/ini.lisp index 10625f4..a2e4eb8 100644 --- a/src/lisp/ini.lisp +++ b/src/lisp/ini.lisp @@ -263,9 +263,6 @@ (defvar *assets* #+android "assets:/lib/" #+ios "assets/") -#+ios -(defvar *local-assets* "local-assets/") - #+ios (progn ;; adapt paths to iOS specific values @@ -339,12 +336,8 @@ (when (or (not ini) (not (probe-file (merge-pathnames "encodings/")))) #+ios - (flet ((dir (assets) - (namestring (merge-pathnames assets *bundle-root*)))) - (let ((assets (dir *assets*)) - (local-assets (dir *local-assets*))) - (copy-asset-files assets assets) - (copy-asset-files local-assets local-assets))) + (let ((assets (namestring (merge-pathnames *assets* *bundle-root*)))) + (copy-asset-files assets assets)) #+android (copy-asset-files)) #-mobile