Merge branch 'main' of github.com:NiklasEi/bevy_game_template into mo…

…re_menu
NiklasEi · Oct 28, 2023 · b9b96cf · b9b96cf
2 parents 09bc5bf + 8e9277d
commit b9b96cf
Show file tree

Hide file tree

Showing 14 changed files with 644 additions and 545 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -35,6 +35,8 @@
             },
             "linux": {
                 "env": {
+                    // platform-specific launch config overwrites (rather than merges with) existing config, so need to specify CARGO_MANIFEST_DIR again
+                    "CARGO_MANIFEST_DIR": "${workspaceFolder}",
                     "LD_LIBRARY_PATH": "${env:LD_LIBRARY_PATH}:${workspaceFolder}/target/debug:${env:HOME}/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib:${env:HOME}/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib"
                 }
             }
@@ -65,4 +67,4 @@
             }
         }
     ]
-}
+}