From 1da7e1da8c8445cd83b95c15df97cc10d8d55d65 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Tue, 30 Jul 2019 14:00:10 +0200 Subject: [PATCH] Review VSCode project --- projects/VSCode/.vscode/c_cpp_properties.json | 4 ++-- projects/VSCode/.vscode/tasks.json | 10 ++++++++-- projects/VSCode/Makefile | 5 ++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/projects/VSCode/.vscode/c_cpp_properties.json b/projects/VSCode/.vscode/c_cpp_properties.json index 496a9b2df..10881ee8a 100644 --- a/projects/VSCode/.vscode/c_cpp_properties.json +++ b/projects/VSCode/.vscode/c_cpp_properties.json @@ -14,9 +14,9 @@ "PLATFORM_DESKTOP" ], "compilerPath": "C:/raylib/mingw/bin/gcc.exe", - "cStandard": "c11", + "cStandard": "c99", "cppStandard": "c++14", - "intelliSenseMode": "clang-x64" + "intelliSenseMode": "gcc-x64" }, { "name": "Mac", diff --git a/projects/VSCode/.vscode/tasks.json b/projects/VSCode/.vscode/tasks.json index 70337b6f7..e701baad0 100644 --- a/projects/VSCode/.vscode/tasks.json +++ b/projects/VSCode/.vscode/tasks.json @@ -26,7 +26,10 @@ "group": { "kind": "build", "isDefault": true - } + }, + "problemMatcher": [ + "$gcc" + ] }, { "label": "build release", @@ -47,7 +50,10 @@ "RAYLIB_PATH=/raylib", ], }, - "group": "build" + "group": "build", + "problemMatcher": [ + "$gcc" + ] } ] } diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile index e3c25c764..13a2853ba 100644 --- a/projects/VSCode/Makefile +++ b/projects/VSCode/Makefile @@ -29,8 +29,10 @@ RAYLIB_VERSION ?= 2.5.0 RAYLIB_API_VERSION ?= 251 RAYLIB_PATH ?= ..\.. -# Define default options +# Define compiler path on Windows +COMPILER_PATH ?= C:/raylib/mingw/bin +# Define default options # One of PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB PLATFORM ?= PLATFORM_DESKTOP @@ -68,6 +70,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # ifeq ($(UNAME),Msys) -> Windows ifeq ($(OS),Windows_NT) PLATFORM_OS=WINDOWS + export PATH := $(COMPILER_PATH):$(PATH) else UNAMEOS=$(shell uname) ifeq ($(UNAMEOS),Linux)