Skip to content

Commit dd57d09

Browse files
committed
squash: sync main to async-optimized-scan
1 parent 934c491 commit dd57d09

81 files changed

Lines changed: 8834 additions & 660 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.sconsign.dblite

59.7 KB
Binary file not shown.

SConstruct

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ BIN_DIR.mkdir(parents=True, exist_ok=True)
5151

5252
env = SConscript(str(GODOT_CPP_SCONSTRUCT))
5353

54+
existing_cxxflags = [str(flag) for flag in env.get("CXXFLAGS", [])]
55+
if platform == "windows":
56+
env["CXXFLAGS"] = [flag for flag in existing_cxxflags if not flag.startswith("/std:")]
57+
else:
58+
env["CXXFLAGS"] = [flag for flag in existing_cxxflags if not flag.startswith("-std=")]
59+
5460
env.AppendUnique(CPPPATH=[
5561
"src",
5662
"third-party/sqlite3",
@@ -88,18 +94,23 @@ object_dir.mkdir(parents=True, exist_ok=True)
8894
sqlite_env = env.Clone()
8995

9096
if platform == "windows":
97+
sqlite_env.AppendUnique(CCFLAGS=[
98+
"/std:c17",
99+
])
91100
sqlite_env.AppendUnique(CCFLAGS=[
92101
"/wd4090",
93102
"/wd4996",
94103
])
95104
elif platform == "linux":
96105
sqlite_env.AppendUnique(CCFLAGS=[
106+
"-std=c17",
97107
"-Wno-discarded-qualifiers",
98108
"-Wno-unused-parameter",
99109
"-Wno-unused-variable",
100110
])
101111
elif platform == "macos":
102112
sqlite_env.AppendUnique(CCFLAGS=[
113+
"-std=c17",
103114
"-Wno-incompatible-pointer-types-discards-qualifiers",
104115
"-Wno-unused-parameter",
105116
"-Wno-unused-variable",
@@ -132,10 +143,16 @@ default_targets = [library]
132143
if build_doctest:
133144
native_test_sources = [
134145
"tests/native/test_main.cpp",
146+
"tests/native/scanner_benchmark.cpp",
135147
"tests/native/schema_v2_tests.cpp",
148+
"tests/native/scanner_native_tests.cpp",
136149
"src/database/gotool_database.cpp",
137150
"src/database/gotool_schema.cpp",
138151
"src/database/gotool_project_registry_repository.cpp",
152+
"src/project_scanner/native_directory_enumerator.cpp",
153+
"src/project_scanner/native_scan_pipeline.cpp",
154+
"src/project_scanner/native_scan_rules.cpp",
155+
"src/project_scanner/native_script_parser.cpp",
139156
]
140157

141158
native_test_env = env

0 commit comments

Comments
 (0)