Delete builddefines.h

Nothing was left in it but the include of profiler.h, and 132 translation units
were including it for that alone. Fifteen files were leaning on profiler.h to
drag in <set>, <vector> and <ostream> for them; those now include what they use.

This is the commit that moves line numbers. Removing an include line shifts
__LINE__ by one for everything below it, and __LINE__ is an immediate operand in
every Assert() and DebugMsg() call, so the four game executables differ from
their predecessors by roughly a thousand 32-bit constants each. Every one of
those is accounted for: each is a single immediate that moved by -1 where the
builddefines.h include went away, or +1 where a <set>/<vector> include was
added. Nothing else in .text, .rdata or .data moves, no object file's section
sizes change, and symbolize_crash and Ja2Export stay bit-identical.

The one non-immediate difference is that the 24 Editor translation units of the
non-editor apps stop emitting __Avx2WmemEnabledWeakValue, a 4-byte weak COMDAT
they only ever instantiated through profiler.h's <vector>. It is a UCRT weak
default that other translation units still provide.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Editor/Button Defines.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __BUTTON_DEFINES_H

Editor/Cursor Modes.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/Cursor Modes.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __CURSOR_MODES_H

Editor/Editor Callback Prototypes.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITOR_CALLBACK_PROTOTYPES_H

Editor/Editor Callbacks.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/Editor Modes.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 
 #ifdef JA2EDITOR

Editor/Editor Modes.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITOR_MODES_H

Editor/Editor Taskbar Creation.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/Editor Taskbar Creation.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITOR_TASKBAR_CREATION_H

Editor/Editor Taskbar Utils.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/Editor Taskbar Utils.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITOR_TASKBAR_UTILS_H

Editor/Editor Undo.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/Editor Undo.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITOR_UNDO_H

Editor/EditorBuildings.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/EditorBuildings.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITORBUILDINGS_H

Editor/EditorDefines.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITORDEFINES_H

Editor/EditorItems.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/EditorItems.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITORITEMS_H

Editor/EditorMapInfo.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/EditorMapInfo.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITORMAPINFO_H

Editor/EditorMercs.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/EditorMercs.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "builddefines.h"
 
 //-----------------------------------------------
 //

Editor/EditorTerrain.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/EditorTerrain.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITORTERRAIN_H

Editor/Item Statistics.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/Item Statistics.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifndef __ITEM_STATISTICS_H
 #define __ITEM_STATISTICS_H

Editor/LoadScreen.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/LoadScreen.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 #include "FileMan.h"
 
 #define FILENAME_BUFLEN (30 + 4 + 1)//dnl ch39 190909 +4 is for ".dat", +1 is for '\0' //dnl ch81 021213

Editor/Road Smoothing.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/Road Smoothing.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/Sector Summary.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/Sector Summary.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __SECTOR_SUMMARY_H

Editor/SmartMethod.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/SmartMethod.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __SMARTMETHOD_H

Editor/Smoothing Utils.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/Smoothing Utils.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __SMOOTHING_UTILS_H

Editor/Summary Info.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __SUMMARY_INFO_H

Editor/edit_sys.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 
 #ifdef JA2EDITOR

Editor/edit_sys.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDIT_SYS_H

Editor/editscreen.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/editscreen.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef EDITSCREEN_H

Editor/messagebox.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/messagebox.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __MESSAGEBOX_H

Editor/newsmooth.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/newsmooth.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __NEWSMOOTH_H

Editor/popupmenu.cpp

@@ -10,7 +10,6 @@
 //supported.  Just remove the commented line of code (search for UNCOMMENT), and it's fixed -- it is
 //currently disabled.
 
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/popupmenu.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 //popupmenu.h

Editor/selectwin.cpp

@@ -1,6 +1,5 @@
 // WANNE: EDITOR: todo
 
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/selectwin.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef _SELECTION_WIN_H_

Editor/smooth.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/smooth.h

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __SMOOTH_H

Ja2/Init.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 #include <stdio.h>
 #include "sgp.h"
 #include "Screens.h"

Ja2/Sys Globals.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdarg.h>
 	#include <stdio.h>
 	#include <wchar.h>

Ja2/aniviewscreen.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 #include <stdio.h>
 #include <types.h>
 #include <video.h>

Ja2/builddefines.h

@@ -1,10 +0,0 @@
-#ifndef _BUILDDEFINES_H
-#define _BUILDDEFINES_H
-
-// The compile-time switches that used to live here now live in CMakeLists.txt,
-// which is where the build system can see them. This header is empty and about
-// to be deleted; do not add anything to it.
-
-#include "profiler.h"
-
-#endif

Ja2/gamescreen.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 #include <stdio.h>
 #include "sgp.h"
 #include "gameloop.h"

Ja2/jascreens.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 #include <cstdio>
 #include "sgp.h"
 #include "gameloop.h"

Ja2/profiler.cpp

@@ -1,6 +1,5 @@
 #ifdef PROFILER_ENABLED
 
-#include "builddefines.h"
 #include <sstream>
 
 #ifdef PERIODIC_PROFILING

Laptop/IMP Gear.cpp

@@ -3,6 +3,7 @@
 * @author Flugente (bears-pit.com)
 */
 
+#include <set>
 #include "IMP Gear.h"
 #include "IMP Skill Trait.h"
 #include "Button System.h"

Laptop/MilitiaWebsite.cpp

@@ -3,6 +3,7 @@
 * @author Flugente (bears-pit.com)
 */
 
+#include <set>
 #include "laptop.h"
 #include "insurance.h"
 #include "insurance Contract.h"

Laptop/files.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include <list>
 	#include "laptop.h"

Laptop/merccompare.cpp

@@ -3,6 +3,7 @@
 * @author Flugente (bears-pit.com)
 */
 
+#include <set>
 #include "laptop.h"
 #include "insurance.h"
 #include "insurance Contract.h"

Multiplayer/client.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include "Bullets.h"
 	#include <stdio.h>
 	#include <string.h>

Multiplayer/connect.h

@@ -5,7 +5,6 @@
 #include "Merc Hiring.h"
 #include "Event Pump.h"
 #include "Bullets.h"
-#include "builddefines.h"
 #include "Strategic Movement.h"
 
 extern bool isOwnTeamWipedOut;

Strategic/AI Viewer.cpp

@@ -1,6 +1,5 @@
 //Strategic AI Viewer
 
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include "types.h"
 	#include "english.h"

Strategic/ASD.cpp

@@ -3,6 +3,7 @@
 * @author Flugente (bears-pit.com)
 */
 
+#include <set>
 #include <math.h>
 #include "ASD.h"
 #include "strategic.h"

Strategic/ASD.h

@@ -6,6 +6,8 @@
 * @author Flugente (bears-pit.com)
 */
 
+#include <vector>
+#include <set>
 #include "types.h"
 
 /** Flugente: Arulco special division decision code

Strategic/Auto Resolve.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 #include <stdio.h>
 #include "types.h"
 #include "Auto Resolve.h"

Strategic/Campaign Types.h

@@ -1,6 +1,7 @@
 #ifndef __CAMPAIGN_TYPES_H
 #define __CAMPAIGN_TYPES_H
 
+#include <vector>
 #include "types.h"
 #include "DEBUG.H"
 #include <map>

Strategic/Facilities.cpp

@@ -6,7 +6,6 @@
 // XML_FacilityTypes.cpp for the reading XML functions.
 //////////////////////////////////////////////////////////////////
 
-#include "builddefines.h"
 
 	#include "Campaign Types.h"
 	#include "Facilities.h"

Strategic/Game Event Hook.h

@@ -1,6 +1,7 @@
 #ifndef __GAME_EVENT_HOOK_H
 #define __GAME_EVENT_HOOK_H
 
+#include <vector>
 #include "types.h"
 
 enum

Strategic/Game Events.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include "types.h"
 	#include "Game Events.h"

Strategic/Ja25 Strategic Ai.cpp

@@ -1,5 +1,4 @@
 #ifdef JA2UB
-#include "builddefines.h"
 
 	#include "strategicmap.h"
 	#include "strategic.h"

Strategic/Map Screen Interface Map.cpp

@@ -1,3 +1,4 @@
+#include <set>
 	#include "Font.h"
 	#include "Font Control.h"
 	#include "mapscreen.h"

Strategic/Merc Contract.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 	#include "types.h"
 	#include "Merc Contract.h"

Strategic/PreBattle Interface.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include "PreBattle Interface.h"
 	#include "Button System.h"

Strategic/Quest Debug System.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 	#include	"types.h"
 	#include	"Quest Debug System.h"

Strategic/Scheduling.h

@@ -1,7 +1,6 @@
 #ifndef __SCHEDULING_H
 #define __SCHEDULING_H
 
-#include "builddefines.h"
 #include "Soldier Init List.h"
 
 //Merc scheduling actions

Strategic/Strategic AI.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include "types.h"
 	#include "Strategic Movement.h"

Strategic/Strategic Movement.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdlib.h>
 	#include "Strategic Movement.h"
 	#include "MemMan.h"

Strategic/Strategic Town Loyalty.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 	#include "Strategic Town Loyalty.h"
 	#include "strategicmap.h"

Strategic/Strategic Transport Groups.cpp

@@ -18,6 +18,7 @@ Transport group compositions will vary based on the player's progress, how many
 and the difficulty of the game.
 
 */
+#include <set>
 #include "Strategic Transport Groups.h"
 
 #include "ASD.h"

Strategic/Town Militia.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 	#include "Town Militia.h"
 	#include "Militia Control.h"

Strategic/XML_Army.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 	#include <stdio.h>
 	#include "XML.h"

Strategic/XML_Bloodcats.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include "XML.h"
 	#include "expat.h"

Strategic/XML_CoolnessBySector.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include "XML.h"
 	#include "expat.h"

Strategic/XML_ExtraItems.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 #include <stdio.h>
 #include "XML.h"
 #include "expat.h"

Strategic/XML_SectorNames.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include "XML.h"
 	#include "expat.h"

Strategic/XML_UniformColors.cpp

@@ -8,7 +8,6 @@
 //////////////////////////////////////////////////////////////
 
 
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include "XML.h"
 	#include "expat.h"

Strategic/strategicmap.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 
 #include "strategicmap.h"
 #include "strategic.h"

Tactical/Animation Data.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include <string.h>
 	#include "WCheck.h"

Tactical/Arms Dealer Init.cpp

@@ -1,3 +1,4 @@
+#include <set>
 	#include "types.h"
 	#include <cstdlib>
 	#include "Arms Dealer Init.h"

Tactical/Campaign.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include "DEBUG.H"
 	#include "Overhead Types.h"

Tactical/Civ Quotes.cpp

@@ -1,4 +1,3 @@
-#include "builddefines.h"
 #include <stdio.h>
 #include "types.h"
 #include "Civ Quotes.h"

Tactical/Enemy Soldier Save.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
     #include "GameSettings.h"
 	#include <stdio.h>
 	#include "types.h"

Tactical/Faces.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	
 	#include "worlddef.h"

Tactical/Handle Items.h

@@ -1,6 +1,7 @@
 #ifndef __HANDLE_ITEMS_H
 #define __HANDLE_ITEMS_H
 
+#include <set>
 #include "World Items.h"
 #include "structure.h"
 #include "Soldier Control.h"

Tactical/Interface Dialogue.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include "sgp.h"
 	#include "faces.h"
@@ -5716,7 +5715,7 @@ void DisplayJerryBreakingLaptopTransmitterPopup()
 		swprintf( zString, zNewTacticalMessages[ TCTL_MSG__JERRY_BREAKIN_LAPTOP_ANTENA ], Menptr[ bID ].name );
 	}
 */
-	#ifdef UBMODSHADYJOB   //See file builddefines.h
+	#ifdef UBMODSHADYJOB
 		swprintf( zString, XMLTacticalMessages[0] ); //Shady Job
 	#else
 		swprintf( zString, zNewTacticalMessages[TCTL_MSG__JERRY_BREAKIN_LAPTOP_ANTENA], Menptr[ bID ].name ); //UB

Tactical/Interface Enhanced.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include <stdio.h>
 	#include "sgp.h"
 	#include "vobject.h"

Tactical/Interface Items.cpp

@@ -1,4 +1,3 @@
-	#include "builddefines.h"
 	#include "mapscreen.h"
 	#include <stdio.h>
 	#include "sgp.h"