Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp

.gitignore

@@ -4,7 +4,10 @@ cmake-*/
 build*/
 CMakeFiles/
 *.xcodeproj
-.*/
+.vscode/**
+.vs
+.idea
+!.vscode/settings.json
 testmaps/*.bsp
 **/*decompile*.map
 testmaps/*.bsp.qbsplog

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "search.exclude": {
+        "3rdparty/**": true
+    }
+}

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}")
 

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());