Merge remote-tracking branch 'upstream/master'

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

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"
+          }
         ]
       }

projects/VSCode/.vscode/tasks.json

@@ -33,10 +33,7 @@
                 "RAYLIB_PATH=<path_to_raylib>",
                 "DEBUGGING=TRUE"
             ],
-            "group": {
+            "group": "build"
-                "kind": "build",
-                "isDefault": true
-            }
         },
         {
             "label": "(OSX) build release",
@@ -47,6 +44,28 @@
                 "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": "(GNU) build release",
+            "type": "process",
+            "command": "make",
+            "args": [
+                "PLATFORM=PLATFORM_DESKTOP",
+            ],
+            "group": "build"
         }
     ]
 }

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!

src/core.c

@@ -1424,8 +1424,7 @@ const char *GetDirectoryPath(const char *fileName)
     memset(filePath, 0, 256);
 
     lastSlash = strprbrk(fileName, "\\/");
-    if (!lastSlash)
+    if (!lastSlash) return NULL;
-        return NULL;
 
     strncpy(filePath, fileName, strlen(fileName) - (strlen(lastSlash) - 1));
     filePath[strlen(fileName) - strlen(lastSlash)] = '\0';

src/raylib.rc

@@ -9,7 +9,7 @@ BEGIN
 	//BLOCK "080904E4" 	// English UK
     BLOCK "040904E4"	// English US
     BEGIN
-	  VALUE "CompanyName", "raylib technologies"
+	  //VALUE "CompanyName", "raylib technologies"
       VALUE "FileDescription", "Created using raylib (www.raylib.com)"
       VALUE "FileVersion", "2.0.0"
       VALUE "InternalName", "raylib app"