diff options
| author | Ray <[email protected]> | 2018-11-20 19:02:26 +0100 |
|---|---|---|
| committer | Ray <[email protected]> | 2018-11-20 19:02:26 +0100 |
| commit | 98fee844d1794465d5b327e60b85a5030a8bea62 (patch) | |
| tree | c2d61554a20466795adf48e2f9b33e60980aaacf /projects/VSCode | |
| parent | 31d0fd820de9cb69b622d9dcf70ca0758d705e61 (diff) | |
| download | raylib-98fee844d1794465d5b327e60b85a5030a8bea62.tar.gz raylib-98fee844d1794465d5b327e60b85a5030a8bea62.zip | |
Some tweaks on VSCode
Now it works on Windows for me but there are lots of hardcoded paths around... I don't like it.
Diffstat (limited to 'projects/VSCode')
| -rw-r--r-- | projects/VSCode/.vscode/c_cpp_properties.json | 2 | ||||
| -rw-r--r-- | projects/VSCode/.vscode/launch.json | 10 | ||||
| -rw-r--r-- | projects/VSCode/.vscode/tasks.json | 4 | ||||
| -rw-r--r-- | projects/VSCode/Makefile | 4 |
4 files changed, 11 insertions, 9 deletions
diff --git a/projects/VSCode/.vscode/c_cpp_properties.json b/projects/VSCode/.vscode/c_cpp_properties.json index 496a9b2d..d4d8e14a 100644 --- a/projects/VSCode/.vscode/c_cpp_properties.json +++ b/projects/VSCode/.vscode/c_cpp_properties.json @@ -13,7 +13,7 @@ "GRAPHICS_API_OPENGL_33", "PLATFORM_DESKTOP" ], - "compilerPath": "C:/raylib/mingw/bin/gcc.exe", + "compilerPath": "C:/raylib/mingw32/bin/gcc.exe", "cStandard": "c11", "cppStandard": "c++14", "intelliSenseMode": "clang-x64" diff --git a/projects/VSCode/.vscode/launch.json b/projects/VSCode/.vscode/launch.json index b65aa1c1..be3fa55a 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}/game", + "program": "${workspaceFolder}/${fileBasenameNoExtension}", "args": [], "stopAtEntry": false, "cwd": "${workspaceFolder}", @@ -23,7 +23,7 @@ } ], "windows": { - "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe", + "miDebuggerPath": "C:/raylib/mingw32/bin/gdb.exe", }, "osx": { "MIMode": "lldb" @@ -42,11 +42,11 @@ "cwd": "${workspaceFolder}", "environment": [], "externalConsole": false, - "program": "${workspaceFolder}/game", + "program": "${workspaceFolder}/${fileBasenameNoExtension}", "MIMode": "gdb", "windows": { - "program": "${workspaceFolder}/game.exe", - "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe" + "program": "${workspaceFolder}/${fileBasenameNoExtension}.exe", + "miDebuggerPath": "C:/raylib/mingw32/bin/gdb.exe" }, "osx": { "MIMode": "lldb" diff --git a/projects/VSCode/.vscode/tasks.json b/projects/VSCode/.vscode/tasks.json index 6106c05f..93e4d396 100644 --- a/projects/VSCode/.vscode/tasks.json +++ b/projects/VSCode/.vscode/tasks.json @@ -12,7 +12,7 @@ "DEBUGGING=TRUE" ], "windows": { - "command": "C:/raylib/mingw/bin/mingw32-make.exe", + "command": "C:/raylib/mingw32/bin/mingw32-make.exe", "args": [ "RAYLIB_PATH=C:/raylib/raylib" ], @@ -35,7 +35,7 @@ "PLATFORM=PLATFORM_DESKTOP", ], "windows": { - "command": "C:/raylib/mingw/bin/mingw32-make.exe", + "command": "C:/raylib/mingw32/bin/mingw32-make.exe", "args": [ "RAYLIB_PATH=C:/raylib/raylib", ], diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile index 6653b576..747718fc 100644 --- a/projects/VSCode/Makefile +++ b/projects/VSCode/Makefile @@ -54,6 +54,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # ifeq ($(UNAME),Msys) -> Windows ifeq ($(OS),Windows_NT) PLATFORM_OS=WINDOWS + export PATH := C:/raylib/mingw32/bin:$(PATH) else UNAMEOS=$(shell uname) ifeq ($(UNAMEOS),Linux) @@ -291,7 +292,8 @@ OBJ_DIR = obj # Define all object files from source files SRC = $(call rwildcard, *.c, *.h) -OBJS = $(SRC:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o) +#OBJS = $(SRC:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o) +OBJS = main.c # For Android platform we call a custom Makefile.Android ifeq ($(PLATFORM),PLATFORM_ANDROID) |