Skip to content

Commit

Permalink
Merge pull request #34 from Ed94/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Ed94 authored Sep 8, 2023
2 parents 49a2cd7 + 6ea4009 commit 2c893d5
Show file tree
Hide file tree
Showing 88 changed files with 4,994 additions and 2,198 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,9 @@ bld/
[Ll]og/
[Ll]ogs/
vc140.pdb


# Unreal
**/Unreal/*.h
**/Unreal/*.cpp
! **/Unreal/validate.unreal.cpp
6 changes: 4 additions & 2 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
"UNICODE",
"_UNICODE",
"GEN_TIME",
"GEN_IMPLEMENTATION"
"GEN_IMPLEMENTATION",
// "GEN_DONT_USE_NAMESPACE"
"GEN_INTELLISENSE_DIRECTIVES"
],
"windowsSdkVersion": "10.0.19041.0",
"compilerPath": "C:/Program Files/Microsoft Visual Studio/2022/Professional/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/cl.exe",
Expand All @@ -28,8 +29,9 @@
"UNICODE",
"_UNICODE",
"GEN_TIME",
"GEN_IMPLEMENTATION"
"GEN_IMPLEMENTATION",
// "GEN_DONT_USE_NAMESPACE"
"GEN_INTELLISENSE_DIRECTIVES"
],
"windowsSdkVersion": "10.0.19041.0",
"compilerPath": "C:/Users/Ed/scoop/apps/llvm/current/bin/clang++.exe",
Expand Down
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@
"filesystem": "cpp",
"format": "cpp",
"ratio": "cpp",
"xstring": "cpp"
"xstring": "cpp",
"functional": "cpp",
"vector": "cpp",
"list": "cpp",
"xhash": "cpp"
},
"C_Cpp.intelliSenseEngineFallback": "disabled",
"mesonbuild.configureOnOpen": true,
Expand Down
Loading

0 comments on commit 2c893d5

Please sign in to comment.