From ca45f06bdf700b91e9cae51187f427baa5ae51f7 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Fri, 4 Nov 2022 00:53:34 -0600 Subject: [PATCH 1/3] bspinfo: fix format string --- common/bspfile.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/bspfile.cc b/common/bspfile.cc index 3768e179..215f4199 100644 --- a/common/bspfile.cc +++ b/common/bspfile.cc @@ -2713,7 +2713,7 @@ void PrintBSPFileSizes(const bspdata_t *bspdata) } if (bspdata->bspx.entries.size()) { - logging::print("\n{:<16 {:10}\n", "BSPX lump name", "byte size"); + logging::print("\n{:<16} {:10}\n", "BSPX lump name", "byte size"); for (auto &x : bspdata->bspx.entries) { logging::print("{:<16} {:10}\n", x.first, x.second.size()); From 1c6e481c9a89723513004f010cb7a3a396e1f8ac Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sat, 5 Nov 2022 15:14:20 -0600 Subject: [PATCH 2/3] vs code: put 3rdparty dir in search exclude list also adjust gitignore to allow committing this --- .gitignore | 5 ++++- .vscode/settings.json | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 1690cd1f..bd4afd64 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,10 @@ cmake-*/ build*/ CMakeFiles/ *.xcodeproj -.*/ +.vscode/** +.vs +.idea +!.vscode/settings.json testmaps/*.bsp **/*decompile*.map testmaps/*.bsp.qbsplog diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..3cd43d70 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "search.exclude": { + "3rdparty/**": true + } +} \ No newline at end of file From 46ae50cb1f4b0f1e542c0639a6457a12af1204b2 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sat, 5 Nov 2022 15:16:30 -0600 Subject: [PATCH 3/3] build: don't use LTO with RelWithDebInfo, slows down linking too much during dev --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 997b40ae..50aa0f57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,7 @@ set(CMAKE_C_STANDARD 99) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG OFF) +set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO OFF) add_definitions(-DERICWTOOLS_VERSION="${GIT_DESCRIBE}")