From 439b53c74dc0bcbc8dddeda713abbe76a33aca05 Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Wed, 14 Aug 2024 18:01:58 -0700 Subject: [PATCH] vscode --- .vscode/tasks.json | 11 +++++++---- build/premake5.lua | 4 ++-- include/resource_dir.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 314809a..2459e6f 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -51,18 +51,21 @@ { "label": "UpdateMake", "type": "process", - "command": "./build/premake5", + "command": "./premake5", + "options": { + "cwd": "${workspaceFolder}/build/" + }, "args": [ "gmake2" ], "windows": { - "command": "./build/premake5.exe" + "command": "./premake5.exe" }, "linux": { - "command": "./build/premake5" + "command": "./premake5" }, "osx": { - "command": "./build/premake5.osx" + "command": "./premake5.osx" }, "group": "build" } diff --git a/build/premake5.lua b/build/premake5.lua index c52ff8d..7661ffe 100644 --- a/build/premake5.lua +++ b/build/premake5.lua @@ -56,9 +56,9 @@ end workspaceName = 'MyGame' baseName = path.getbasename(path.getdirectory(os.getcwd())); -if (baseName ~= 'raylib-quickstart') then +--if (baseName ~= 'raylib-quickstart') then workspaceName = baseName -end +--end if (os.isdir('build_files') == false) then os.mkdir('build_files') diff --git a/include/resource_dir.h b/include/resource_dir.h index 41c4dce..65096f0 100644 --- a/include/resource_dir.h +++ b/include/resource_dir.h @@ -44,7 +44,7 @@ extern "C" { // Prevents name mangling of functions /// /// The name of the resources dir to look for /// True if a dir with the name was found, false if no change was made to the working dir - inline bool SearchAndSetResourceDir(const char* folderName) + inline static bool SearchAndSetResourceDir(const char* folderName) { // check the working dir if (DirectoryExists(folderName))