From dd48d34270d8938bfceb87e2649284ae52cb7a32 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Mon, 12 Aug 2024 01:34:05 +0200 Subject: [PATCH] Update c_cpp_properties.json for VSCode (#2033) --- docs/c_cpp_properties.json | 173 ++++++++++++++++++++++++++++++++++--- docs/vscode.md | 5 +- 2 files changed, 164 insertions(+), 14 deletions(-) diff --git a/docs/c_cpp_properties.json b/docs/c_cpp_properties.json index ed8c0feaae..64e468330b 100644 --- a/docs/c_cpp_properties.json +++ b/docs/c_cpp_properties.json @@ -1,5 +1,90 @@ { "configurations": [ + { + "name": "oot-ntsc-1.2", + "compilerArgs": [ + "-m32" + ], + "includePath": [ + "include", + "include/libc", + "src", + "build/ntsc-1.2", + ".", + "extracted/ntsc-1.2" + ], + "defines": [ + "_LANGUAGE_C", + "OOT_VERSION=OOT_NTSC_1_2", + "OOT_REGION=REGION_JP", + "PLATFORM_N64=1", + "PLATFORM_GC=0", + "OOT_NTSC=1", + "OOT_MQ=0", + "OOT_DEBUG=0", + "NDEBUG", + "F3DEX_GBI_2" + ], + "cStandard": "gnu89" + }, + { + "name": "oot-gc-jp", + "compilerArgs": [ + "-m32" + ], + "includePath": [ + "include", + "include/libc", + "src", + "build/gc-jp", + ".", + "extracted/gc-jp" + ], + "defines": [ + "_LANGUAGE_C", + "OOT_VERSION=OOT_GC_JP", + "OOT_REGION=REGION_JP", + "PLATFORM_N64=0", + "PLATFORM_GC=1", + "OOT_NTSC=1", + "OOT_MQ=0", + "OOT_DEBUG=0", + "NDEBUG", + "F3DEX_GBI_2", + "F3DEX_GBI_PL", + "GBI_DOWHILE" + ], + "cStandard": "gnu89" + }, + { + "name": "oot-gc-jp-mq", + "compilerArgs": [ + "-m32" + ], + "includePath": [ + "include", + "include/libc", + "src", + "build/gc-jp-mq", + ".", + "extracted/gc-jp-mq" + ], + "defines": [ + "_LANGUAGE_C", + "OOT_VERSION=OOT_GC_JP_MQ", + "OOT_REGION=REGION_JP", + "PLATFORM_N64=0", + "PLATFORM_GC=1", + "OOT_NTSC=1", + "OOT_MQ=1", + "OOT_DEBUG=0", + "NDEBUG", + "F3DEX_GBI_2", + "F3DEX_GBI_PL", + "GBI_DOWHILE" + ], + "cStandard": "gnu89" + }, { "name": "oot-gc-us", "compilerArgs": [ @@ -17,6 +102,8 @@ "_LANGUAGE_C", "OOT_VERSION=OOT_GC_US", "OOT_REGION=REGION_US", + "PLATFORM_N64=0", + "PLATFORM_GC=1", "OOT_NTSC=1", "OOT_MQ=0", "OOT_DEBUG=0", @@ -27,6 +114,64 @@ ], "cStandard": "gnu89" }, + { + "name": "oot-gc-us-mq", + "compilerArgs": [ + "-m32" + ], + "includePath": [ + "include", + "include/libc", + "src", + "build/gc-us-mq", + ".", + "extracted/gc-us-mq" + ], + "defines": [ + "_LANGUAGE_C", + "OOT_VERSION=OOT_GC_US_MQ", + "OOT_REGION=REGION_US", + "PLATFORM_N64=0", + "PLATFORM_GC=1", + "OOT_NTSC=1", + "OOT_MQ=1", + "OOT_DEBUG=0", + "NDEBUG", + "F3DEX_GBI_2", + "F3DEX_GBI_PL", + "GBI_DOWHILE" + ], + "cStandard": "gnu89" + }, + { + "name": "oot-gc-eu-mq-dbg", + "compilerArgs": [ + "-m32" + ], + "includePath": [ + "include", + "include/libc", + "src", + "build/gc-eu-mq-dbg", + ".", + "extracted/gc-eu-mq-dbg" + ], + "defines": [ + "_LANGUAGE_C", + "OOT_VERSION=OOT_GC_EU_MQ_DBG", + "OOT_REGION=REGION_EU", + "PLATFORM_N64=0", + "PLATFORM_GC=1", + "OOT_PAL=1", + "OOT_MQ=1", + "OOT_DEBUG=1", + "F3DEX_GBI_2", + "F3DEX_GBI_PL", + "GBI_DOWHILE", + "GBI_DEBUG" + ], + "cStandard": "gnu89" + }, { "name": "oot-gc-eu", "compilerArgs": [ @@ -44,6 +189,8 @@ "_LANGUAGE_C", "OOT_VERSION=OOT_GC_EU", "OOT_REGION=REGION_EU", + "PLATFORM_N64=0", + "PLATFORM_GC=1", "OOT_PAL=1", "OOT_MQ=0", "OOT_DEBUG=0", @@ -71,6 +218,8 @@ "_LANGUAGE_C", "OOT_VERSION=OOT_GC_EU_MQ", "OOT_REGION=REGION_EU", + "PLATFORM_N64=0", + "PLATFORM_GC=1", "OOT_PAL=1", "OOT_MQ=1", "OOT_DEBUG=0", @@ -82,7 +231,7 @@ "cStandard": "gnu89" }, { - "name": "oot-gc-eu-mq-dbg", + "name": "oot-gc-jp-ce", "compilerArgs": [ "-m32" ], @@ -90,24 +239,26 @@ "include", "include/libc", "src", - "build/gc-eu-mq-dbg", + "build/gc-jp-ce", ".", - "extracted/gc-eu-mq-dbg" + "extracted/gc-jp-ce" ], "defines": [ "_LANGUAGE_C", - "OOT_VERSION=OOT_GC_EU_MQ_DBG", - "OOT_REGION=REGION_EU", - "OOT_PAL=1", - "OOT_MQ=1", - "OOT_DEBUG=1", + "OOT_VERSION=OOT_GC_JP_CE", + "OOT_REGION=REGION_JP", + "PLATFORM_N64=0", + "PLATFORM_GC=1", + "OOT_NTSC=1", + "OOT_MQ=0", + "OOT_DEBUG=0", + "NDEBUG", "F3DEX_GBI_2", "F3DEX_GBI_PL", - "GBI_DOWHILE", - "GBI_DEBUG" + "GBI_DOWHILE" ], "cStandard": "gnu89" - } + }, ], "version": 4 } diff --git a/docs/vscode.md b/docs/vscode.md index c5cd0fc2ea..a50f3c53a8 100644 --- a/docs/vscode.md +++ b/docs/vscode.md @@ -46,11 +46,9 @@ A more complete `c_cpp_properties.json` with configurations for all supported ve "configurations": [ { "name": "oot-gc-eu-mq-dbg", - "compilerPath": "${default}", // Needs to not be "" for -m32 to work "compilerArgs": [ "-m32" // Removes integer truncation warnings with gbi macros ], - "intelliSenseMode": "${default}", // Shouldn't matter "includePath": [ // Matches makefile's includes "include", "include/libc", @@ -64,6 +62,8 @@ A more complete `c_cpp_properties.json` with configurations for all supported ve // Version-specific "OOT_VERSION=OOT_GC_EU_MQ_DBG", "OOT_REGION=REGION_EU", + "PLATFORM_N64=0", + "PLATFORM_GC=1", "OOT_PAL=1", "OOT_MQ=1", "OOT_DEBUG=1", @@ -73,7 +73,6 @@ A more complete `c_cpp_properties.json` with configurations for all supported ve "GBI_DEBUG" ], "cStandard": "gnu89", // C89 + some GNU extensions from C99 like C++ comments - "cppStandard": "${default}" // Only ZAPD uses C++, so doesn't really matter } ], "version": 4