From 5eded83d68f35f55ed4ff5b9a98899d3f1ffe85b Mon Sep 17 00:00:00 2001
From: Murray Campbell <MurrayIRC@gmail.com>
Date: Thu, 30 Aug 2018 09:29:37 -0500
Subject: [PATCH 1/5] Added a configuration for OSX
This requires the user to explicitly specify the path to their raylib folder. We need a better way around this (something like what we do for windows would help).
---
projects/VSCode/.vscode/c_cpp_properties.json | 23 ++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/projects/VSCode/.vscode/c_cpp_properties.json b/projects/VSCode/.vscode/c_cpp_properties.json
index 10494f677..81efa19e9 100644
--- a/projects/VSCode/.vscode/c_cpp_properties.json
+++ b/projects/VSCode/.vscode/c_cpp_properties.json
@@ -17,7 +17,28 @@
"cStandard": "c11",
"cppStandard": "c++14",
"intelliSenseMode": "clang-x64"
+ },
+ {
+ "name": "Mac",
+ "includePath": [
+ "<path_to_raylib>/src/**",
+ "${workspaceFolder}/**"
+ ],
+ "defines": [
+ "_DEBUG",
+ "UNICODE",
+ "_UNICODE",
+ "GRAPHICS_API_OPENGL_33",
+ "PLATFORM_DESKTOP"
+ ],
+ "macFrameworkPath": [
+ "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks"
+ ],
+ "compilerPath": "/usr/bin/clang",
+ "cStandard": "c11",
+ "cppStandard": "c++14",
+ "intelliSenseMode": "clang-x64"
}
],
"version": 4
-}
\ No newline at end of file
+}
From 166fdbe9c04c6648d3417d6387765587c7b70e4f Mon Sep 17 00:00:00 2001
From: Murray Campbell <MurrayIRC@gmail.com>
Date: Thu, 30 Aug 2018 09:33:41 -0500
Subject: [PATCH 2/5] Fixed included libs for OSX
This was causing linker errors on OSX
---
projects/VSCode/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile
index 2f78971b2..6397fb29f 100644
--- a/projects/VSCode/Makefile
+++ b/projects/VSCode/Makefile
@@ -254,7 +254,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
ifeq ($(PLATFORM_OS),OSX)
# Libraries for OSX 10.9 desktop compiling
# NOTE: Required packages: libopenal-dev libegl1-mesa-dev
- LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa
+ LDLIBS = -lraylib -framework OpenGL -framework Cocoa -framework IOKit -framework CoreFoundation -framework CoreVideo
endif
ifeq ($(PLATFORM_OS),BSD)
# Libraries for FreeBSD, OpenBSD, NetBSD, DragonFly desktop compiling
From 160874531216365b4c4b02d064b2f1983f82993f Mon Sep 17 00:00:00 2001
From: Murray Campbell <MurrayIRC@gmail.com>
Date: Thu, 30 Aug 2018 09:40:58 -0500
Subject: [PATCH 3/5] Added OSX launch configurations for debug and release
---
projects/VSCode/.vscode/launch.json | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/projects/VSCode/.vscode/launch.json b/projects/VSCode/.vscode/launch.json
index 4575074f9..5accab286 100644
--- a/projects/VSCode/.vscode/launch.json
+++ b/projects/VSCode/.vscode/launch.json
@@ -5,7 +5,7 @@
"version": "0.2.0",
"configurations": [
{
- "name": "Debug",
+ "name": "(WIN) Debug",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/game.exe",
@@ -23,10 +23,10 @@
"ignoreFailures": false
}
],
- "preLaunchTask": "build debug"
+ "preLaunchTask": "(WIN) build debug"
},
{
- "name": "Run",
+ "name": "(WIN) Run",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/game.exe",
@@ -44,7 +44,25 @@
"ignoreFailures": false
}
],
- "preLaunchTask": "build release"
+ "preLaunchTask": "(WIN) build release"
+ },
+ {
+ "name": "(OSX) Debug",
+ "type": "lldb",
+ "request": "launch",
+ "program": "${workspaceFolder}/game",
+ "args": [],
+ "cwd": "${workspaceFolder}",
+ "preLaunchTask": "(OSX) build debug"
+ },
+ {
+ "name": "(OSX) Run",
+ "type": "lldb",
+ "request": "launch",
+ "program": "${workspaceFolder}/game",
+ "args": [],
+ "cwd": "${workspaceFolder}",
+ "preLaunchTask": "(OSX) build release"
},
]
- }
\ No newline at end of file
+ }
From 921e4eaa87a1e0878be3f43bf94c86db8f1dba07 Mon Sep 17 00:00:00 2001
From: Murray Campbell <MurrayIRC@gmail.com>
Date: Thu, 30 Aug 2018 09:42:33 -0500
Subject: [PATCH 4/5] Added OSX build tasks
Users will have to specify their personal installation of raylib.
---
projects/VSCode/.vscode/tasks.json | 31 ++++++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/projects/VSCode/.vscode/tasks.json b/projects/VSCode/.vscode/tasks.json
index cef9e9604..83e45c392 100644
--- a/projects/VSCode/.vscode/tasks.json
+++ b/projects/VSCode/.vscode/tasks.json
@@ -4,30 +4,49 @@
"version": "2.0.0",
"tasks": [
{
- "label": "build release",
+ "label": "(WIN) build release",
"type": "process",
"command": "C:/raylib/mingw/bin/mingw32-make.exe",
"args": [
"PLATFORM=PLATFORM_DESKTOP",
"RAYLIB_PATH=C:/raylib/raylib",
- "PROJECT_NAME=game",
],
"group": "build"
},
{
- "label": "build debug",
+ "label": "(WIN) build debug",
"type": "process",
"command": "C:/raylib/mingw/bin/mingw32-make.exe",
"args": [
"PLATFORM=PLATFORM_DESKTOP",
"RAYLIB_PATH=C:/raylib/raylib",
- "PROJECT_NAME=game",
- "DEBUGGING=TRUE",
+ "DEBUGGING=TRUE"
+ ],
+ "group": "build"
+ },
+ {
+ "label": "(OSX) build debug",
+ "type": "process",
+ "command": "make",
+ "args": [
+ "PLATFORM=PLATFORM_DESKTOP",
+ "RAYLIB_PATH=<path_to_raylib>",
+ "DEBUGGING=TRUE"
],
"group": {
"kind": "build",
"isDefault": true
}
+ },
+ {
+ "label": "(OSX) build release",
+ "type": "process",
+ "command": "make",
+ "args": [
+ "PLATFORM=PLATFORM_DESKTOP",
+ "RAYLIB_PATH=<path_to_raylib>",
+ ],
+ "group": "build"
}
]
-}
\ No newline at end of file
+}
From 04c45372839132d40c1b007e1f2b25420b57ad55 Mon Sep 17 00:00:00 2001
From: Murray Campbell <MurrayIRC@gmail.com>
Date: Thu, 30 Aug 2018 09:43:53 -0500
Subject: [PATCH 5/5] Update README.md
---
projects/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/README.md b/projects/README.md
index 3b152f983..6cb5798c7 100644
--- a/projects/README.md
+++ b/projects/README.md
@@ -12,6 +12,6 @@ IDE | Platform | Template type | State
[Notepad++](https://notepad-plus-plus.org/) | Windows | source/example compiling | DONE
[VS2015](https://www.visualstudio.com) | Windows | source/example compiling | DONE
[VS2017](https://www.visualstudio.com) | Windows | source/example compiling | DONE
-[VSCode](https://code.visualstudio.com/) | Windows | - | INCOMPLETE
+[VSCode](https://code.visualstudio.com/) | Windows, macOS | - | INCOMPLETE
*New IDEs config files are welcome!*