diff options
| author | ChrisDill <chrisdude134@gmail.com> | 2018-09-27 15:54:02 +0100 |
|---|---|---|
| committer | ChrisDill <chrisdude134@gmail.com> | 2018-09-27 15:54:02 +0100 |
| commit | 73701c12b224b8d0461d50bdd5e3b98f7aaa2297 (patch) | |
| tree | 74b35d743821ce193f14690cd961ff50d6f12555 /projects | |
| parent | 1836e02c1ef9909d25bbb89b9d9fdd6ec934aada (diff) | |
| parent | 29eddb9ff3fda090ed416a2736a6d2db4cca77e9 (diff) | |
| download | raylib-73701c12b224b8d0461d50bdd5e3b98f7aaa2297.tar.gz raylib-73701c12b224b8d0461d50bdd5e3b98f7aaa2297.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/VSCode/.vscode/c_cpp_properties.json | 19 | ||||
| -rw-r--r-- | projects/VSCode/.vscode/launch.json | 42 | ||||
| -rw-r--r-- | projects/VSCode/.vscode/tasks.json | 23 | ||||
| -rw-r--r-- | projects/VSCode/Makefile | 2 |
4 files changed, 83 insertions, 3 deletions
diff --git a/projects/VSCode/.vscode/c_cpp_properties.json b/projects/VSCode/.vscode/c_cpp_properties.json index 81efa19e..496a9b2d 100644 --- a/projects/VSCode/.vscode/c_cpp_properties.json +++ b/projects/VSCode/.vscode/c_cpp_properties.json @@ -38,6 +38,25 @@ "cStandard": "c11", "cppStandard": "c++14", "intelliSenseMode": "clang-x64" + }, + { + "name": "Linux", + "includePath": [ + "<path_to_raylib>/src/**", + "${workspaceFolder}/**" + ], + "defines": [ + "_DEBUG", + "UNICODE", + "_UNICODE", + "GRAPHICS_API_OPENGL_33", + "PLATFORM_DESKTOP" + ], + "compilerPath": "usr/bin/clang", + "cStandard": "c11", + "cppStandard": "c++14", + "intelliSenseMode": "clang-x64" + } ], "version": 4 diff --git a/projects/VSCode/.vscode/launch.json b/projects/VSCode/.vscode/launch.json index 5accab28..8c8a67ea 100644 --- a/projects/VSCode/.vscode/launch.json +++ b/projects/VSCode/.vscode/launch.json @@ -64,5 +64,47 @@ "cwd": "${workspaceFolder}", "preLaunchTask": "(OSX) build release" }, + { + "name": "(GNU) Debug", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/game", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "miDebuggerPath": "/usr/bin/gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": false + } + ], + "preLaunchTask": "(GNU) build debug" + }, + { + "name": "(GNU) Run", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/game", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "miDebuggerPath": "/usr/bin/gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": false + } + ], + "preLaunchTask": "(GNU) build release" + } ] } diff --git a/projects/VSCode/.vscode/tasks.json b/projects/VSCode/.vscode/tasks.json index 83e45c39..d94a2d69 100644 --- a/projects/VSCode/.vscode/tasks.json +++ b/projects/VSCode/.vscode/tasks.json @@ -33,18 +33,37 @@ "RAYLIB_PATH=<path_to_raylib>", "DEBUGGING=TRUE" ], + "group": "build" + }, + { + "label": "(OSX) build release", + "type": "process", + "command": "make", + "args": [ + "PLATFORM=PLATFORM_DESKTOP", + "RAYLIB_PATH=<path_to_raylib>", + ], + "group": "build" + }, + { + "label": "(GNU) build debug", + "type": "process", + "command": "make", + "args": [ + "PLATFORM=PLATFORM_DESKTOP", + "DEBUGGING=TRUE" + ], "group": { "kind": "build", "isDefault": true } }, { - "label": "(OSX) build release", + "label": "(GNU) build release", "type": "process", "command": "make", "args": [ "PLATFORM=PLATFORM_DESKTOP", - "RAYLIB_PATH=<path_to_raylib>", ], "group": "build" } diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile index 6397fb29..9794c1ab 100644 --- a/projects/VSCode/Makefile +++ b/projects/VSCode/Makefile @@ -27,7 +27,7 @@ # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() PLATFORM ?= PLATFORM_DESKTOP RAYLIB_PATH ?= ../.. -PROJECT_NAME ?= standard_game +PROJECT_NAME ?= game DEBUGGING ?= FALSE # Default path for raylib on Raspberry Pi, if installed in different path, update it! |