From 28f266302fbeea2d75d5a62de651d464ab380798 Mon Sep 17 00:00:00 2001
From: Adrian Graber <adrian@adriangraber.com>
Date: Sun, 4 Jul 2021 18:52:48 +0200
Subject: Add Nintendo Switch initial support

---
 .vscode/c_cpp_properties.json | 19 +++++++++++++++++++
 .vscode/settings.json         | 10 ++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

(limited to '.vscode')

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 327d8cc7..a214042a 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -26,6 +26,25 @@
       "compilerArgs": ["-ggdb"],
       "cStandard": "gnu11",
       "cppStandard": "gnu++14"
+    },
+    {
+      "name": "devkitPro aarch64 (Nintendo Switch)",
+      "compilerPath": "${env:DEVKITPRO}/devkitA64/bin/aarch64-none-elf-g++",
+      "includePath": [
+        "${default}",
+        "${env:DEVKITPRO}/portlibs/switch/include",
+        "${env:DEVKITPRO}/libnx/include"
+      ],
+      "intelliSenseMode": "gcc-arm64",
+      "cStandard": "gnu11",
+      "cppStandard": "gnu++11",
+      "defines": [
+        "__SWITCH__",
+        "GTA_SWITCH",
+        "LIBRW",
+        "RW_GL3",
+        "AUDIO_OAL"
+      ]
     }
   ],
   "version": 4
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 10cb5627..ee8362c1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,8 +2,13 @@
   "C_Cpp.default.cStandard": "gnu11",
   "C_Cpp.default.cppStandard": "gnu++14",
   "C_Cpp.default.includePath": [
+    "src",
     "src/animation",
     "src/audio",
+    "src/audio/eax",
+    "src/audio/oal",
+    "src/buildings",
+    "src/collision",
     "src/control",
     "src/core",
     "src/entities",
@@ -15,8 +20,9 @@
     "src/peds",
     "src/render",
     "src/rw",
-    "src/save",
-    "src/skel",
+    "src/save/",
+    "src/skel/",
+    "src/skel/glfw",
     "src/text",
     "src/vehicles",
     "src/weapons",
-- 
cgit v1.2.3


From ca5d3c881133d1fb3c2d9af16de81b63304bc88f Mon Sep 17 00:00:00 2001
From: Adrian Graber <adrian@adriangraber.com>
Date: Mon, 5 Jul 2021 20:02:44 +0200
Subject: Replace GTA_SWITCH macro and use GAMEPAD_MENU

* Replace GTA_SWITCH macro with __SWITCH__ for platform specific stuff and GTA_HANDHELD for the rest (which could be used by other ports)
* Use GAMEPAD_MENU on GTA_HANDHELD, which will replace the usual controller setup (which contains some useless features for handhelds)
* Fix some identation inconsistencies
* Disable PC_PLAYER_CONTROLS on GTA_HANDHELD builds
---
 .vscode/c_cpp_properties.json | 1 -
 1 file changed, 1 deletion(-)

(limited to '.vscode')

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index a214042a..2ce82727 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -40,7 +40,6 @@
       "cppStandard": "gnu++11",
       "defines": [
         "__SWITCH__",
-        "GTA_SWITCH",
         "LIBRW",
         "RW_GL3",
         "AUDIO_OAL"
-- 
cgit v1.2.3