Browse Source

Fixes for .vscode

Sean Taylor 4 years ago
parent
commit
d692a90c01
4 changed files with 9 additions and 10 deletions
  1. 2 2
      .vscode/launch.json
  2. 5 6
      .vscode/settings.json
  3. 1 1
      .vscode/tasks.json
  4. 1 1
      premake5.lua

+ 2 - 2
.vscode/launch.json

@@ -13,7 +13,7 @@
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": [],
-            "externalConsole": false,
+            "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
@@ -25,7 +25,7 @@
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": [],
-            "externalConsole": false,
+            "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
         },
         {

+ 5 - 6
.vscode/settings.json

@@ -108,7 +108,9 @@
         "**/.git/subtree-cache/**": true,
         "**/node_modules/**": true,
         "**/_build/**": true,
-        "**/_compiler/**": true
+        "**/_compiler/**": true,
+        "**/_deps/**": true,
+        "**/_tools/**": true
     },
     "typescript.tsc.autoDetect": "off",
     "grunt.autoDetect": "off",
@@ -126,17 +128,12 @@
         "asciidoc"
     ],
 
-    
     // For intellisense to work you need python 3.6 available on your system:
     "python.pythonPath": "/usr/bin/python3", 
 
     // This enables python language server. Seems to work slightly better than jedi:
     "python.jediEnabled": false, 
 
-    // Python env file is generated buring build step. It points python to binary bindings files for intellisense to work.
-    // If you are building only release configuration you can switch this to "python_release.env":
-    "python.envFile": "${workspaceFolder}/_build/python_debug.env",
-
     // We use "black" as a formatter:
     "python.formatting.provider": "black",
     "python.formatting.blackArgs": ["--line-length", "120"],
@@ -145,4 +142,6 @@
     "python.linting.pylintEnabled": false,
     "python.linting.flake8Enabled": true,
     "python.languageServer": "Microsoft",
+
+    "terminal.integrated.allowChords": false
 }

+ 1 - 1
.vscode/tasks.json

@@ -14,7 +14,7 @@
                 "owner": "cpp",
                 "fileLocation": [
                     "relative",
-                    "${workspaceRoot}/_compiler/vs2019"
+                    "${workspaceRoot}/_compiler/vs2019/gameplay"
                 ],
                 "pattern": {
                     "regexp": "^(.*):(\\d+): \\s+(warning|error):\\s+(.*)$",

+ 1 - 1
premake5.lua

@@ -74,7 +74,6 @@ workspace "gameplay"
             vulkan_sdk_dir.."/lib",
         }
         links { "freetype", "glfw3" }
-        linkoptions { "-export-dynamic" }
         filter { "system:windows" }
             libdirs {
                 deps_dir.."/freetype/bin/"..platform.."/%{cfg.buildcfg}",
@@ -87,6 +86,7 @@ workspace "gameplay"
                 deps_dir.."/glfw/bin/"..platform,
             }
             links { "vulkan", "dl", "pthread", "X11", "z"}
+            linkoptions { "-export-dynamic" }
             buildoptions { "-pthread" }
             disablewarnings { "unused-function", "unused-value", "unused-but-set-variable" }
         filter {}