From c21e9a721b5d417396e117c8e074db4767e32758 Mon Sep 17 00:00:00 2001 From: "Stefan E. Mayer" Date: Mon, 13 Apr 2020 10:51:40 +0100 Subject: [PATCH] Fix VSCode (#1193) * Executable is called game, not main * Use make not mingw32-make on macOS --- projects/VSCode/.vscode/launch.json | 2 +- projects/VSCode/Makefile | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/VSCode/.vscode/launch.json b/projects/VSCode/.vscode/launch.json index 04b385e3e..b65aa1c19 100644 --- a/projects/VSCode/.vscode/launch.json +++ b/projects/VSCode/.vscode/launch.json @@ -8,7 +8,7 @@ "name": "Debug", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/main", + "program": "${workspaceFolder}/game", "args": [], "stopAtEntry": false, "cwd": "${workspaceFolder}", diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile index 64d07f1db..b8c22ce30 100644 --- a/projects/VSCode/Makefile +++ b/projects/VSCode/Makefile @@ -180,6 +180,9 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),LINUX) MAKE = make endif + ifeq ($(PLATFORM_OS),OSX) + MAKE = make + endif endif # Define compiler flags: