From 00fb8986006bcdcbad99b9b9042c0b7a6debc0db Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Fri, 21 Aug 2026 23:56:46 -0300 Subject: [PATCH] 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 , and 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 / 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 . It is a UCRT weak default that other translation units still provide. Co-Authored-By: Claude Opus 5 --- Editor/Button Defines.h | 1 - Editor/Cursor Modes.cpp | 1 - Editor/Cursor Modes.h | 1 - Editor/Editor Callback Prototypes.h | 1 - Editor/Editor Callbacks.cpp | 1 - Editor/Editor Modes.cpp | 1 - Editor/Editor Modes.h | 1 - Editor/Editor Taskbar Creation.cpp | 1 - Editor/Editor Taskbar Creation.h | 1 - Editor/Editor Taskbar Utils.cpp | 1 - Editor/Editor Taskbar Utils.h | 1 - Editor/Editor Undo.cpp | 1 - Editor/Editor Undo.h | 1 - Editor/EditorBuildings.cpp | 1 - Editor/EditorBuildings.h | 1 - Editor/EditorDefines.h | 1 - Editor/EditorItems.cpp | 1 - Editor/EditorItems.h | 1 - Editor/EditorMapInfo.cpp | 1 - Editor/EditorMapInfo.h | 1 - Editor/EditorMercs.cpp | 1 - Editor/EditorMercs.h | 1 - Editor/EditorTerrain.cpp | 1 - Editor/EditorTerrain.h | 1 - Editor/Item Statistics.cpp | 1 - Editor/Item Statistics.h | 1 - Editor/LoadScreen.cpp | 1 - Editor/LoadScreen.h | 1 - Editor/Road Smoothing.cpp | 1 - Editor/Road Smoothing.h | 1 - Editor/Sector Summary.cpp | 1 - Editor/Sector Summary.h | 1 - Editor/SmartMethod.cpp | 1 - Editor/SmartMethod.h | 1 - Editor/Smoothing Utils.cpp | 1 - Editor/Smoothing Utils.h | 1 - Editor/Summary Info.h | 1 - Editor/edit_sys.cpp | 1 - Editor/edit_sys.h | 1 - Editor/editscreen.cpp | 1 - Editor/editscreen.h | 1 - Editor/messagebox.cpp | 1 - Editor/messagebox.h | 1 - Editor/newsmooth.cpp | 1 - Editor/newsmooth.h | 1 - Editor/popupmenu.cpp | 1 - Editor/popupmenu.h | 1 - Editor/selectwin.cpp | 1 - Editor/selectwin.h | 1 - Editor/smooth.cpp | 1 - Editor/smooth.h | 1 - Ja2/Init.cpp | 1 - Ja2/Sys Globals.cpp | 1 - Ja2/aniviewscreen.cpp | 1 - Ja2/builddefines.h | 10 ---------- Ja2/gamescreen.cpp | 1 - Ja2/jascreens.cpp | 1 - Ja2/profiler.cpp | 1 - Laptop/IMP Gear.cpp | 1 + Laptop/MilitiaWebsite.cpp | 1 + Laptop/files.cpp | 1 - Laptop/merccompare.cpp | 1 + Multiplayer/client.cpp | 1 - Multiplayer/connect.h | 1 - Strategic/AI Viewer.cpp | 1 - Strategic/ASD.cpp | 1 + Strategic/ASD.h | 2 ++ Strategic/Auto Resolve.cpp | 1 - Strategic/Campaign Types.h | 1 + Strategic/Facilities.cpp | 1 - Strategic/Game Event Hook.h | 1 + Strategic/Game Events.cpp | 1 - Strategic/Ja25 Strategic Ai.cpp | 1 - Strategic/Map Screen Interface Map.cpp | 1 + Strategic/Merc Contract.cpp | 1 - Strategic/PreBattle Interface.cpp | 1 - Strategic/Quest Debug System.cpp | 1 - Strategic/Scheduling.h | 1 - Strategic/Strategic AI.cpp | 1 - Strategic/Strategic Movement.cpp | 1 - Strategic/Strategic Town Loyalty.cpp | 1 - Strategic/Strategic Transport Groups.cpp | 1 + Strategic/Town Militia.cpp | 1 - Strategic/XML_Army.cpp | 1 - Strategic/XML_Bloodcats.cpp | 1 - Strategic/XML_CoolnessBySector.cpp | 1 - Strategic/XML_ExtraItems.cpp | 1 - Strategic/XML_SectorNames.cpp | 1 - Strategic/XML_UniformColors.cpp | 1 - Strategic/strategicmap.cpp | 1 - Tactical/Animation Data.cpp | 1 - Tactical/Arms Dealer Init.cpp | 1 + Tactical/Campaign.cpp | 1 - Tactical/Civ Quotes.cpp | 1 - Tactical/Enemy Soldier Save.cpp | 1 - Tactical/Faces.cpp | 1 - Tactical/Handle Items.h | 1 + Tactical/Interface Dialogue.cpp | 3 +-- Tactical/Interface Enhanced.cpp | 1 - Tactical/Interface Items.cpp | 1 - Tactical/Interface Panels.cpp | 1 - Tactical/Interface.cpp | 1 - Tactical/Keys.cpp | 1 - Tactical/LOS.cpp | 1 - Tactical/Merc Hiring.cpp | 1 - Tactical/Minigame.cpp | 1 - Tactical/Rotting Corpses.cpp | 1 - Tactical/ShopKeeper Interface.cpp | 1 - Tactical/Soldier Control.cpp | 1 - Tactical/Soldier Init List.cpp | 1 - Tactical/Strategic Exit GUI.cpp | 1 - Tactical/Turn Based Input.cpp | 1 - TileEngine/Ambient Control.cpp | 1 - TileEngine/Explosion Control.cpp | 1 - TileEngine/Interactive Tiles.cpp | 1 - TileEngine/LightEffects.cpp | 1 - TileEngine/Radar Screen.cpp | 1 - TileEngine/Render Dirty.cpp | 1 - TileEngine/Shade Table Util.cpp | 1 - TileEngine/SmokeEffects.cpp | 1 - TileEngine/Tactical Placement GUI.cpp | 1 - TileEngine/Tile Cache.cpp | 1 - TileEngine/Tile Surface.cpp | 1 - TileEngine/WorldDat.cpp | 1 - TileEngine/XML_ExplosionData.cpp | 1 - TileEngine/lighting.cpp | 1 - TileEngine/overhead map.cpp | 1 - TileEngine/physics.cpp | 1 - TileEngine/renderworld.cpp | 1 - TileEngine/worlddef.cpp | 1 - Utils/Cursors.cpp | 1 - Utils/Font Control.h | 1 - Utils/INIReader.cpp | 1 - Utils/INIReader.h | 1 + Utils/Multilingual Text Code Generator.cpp | 1 - Utils/Music Control.h | 1 + Utils/STIConvert.cpp | 1 - Utils/Text Input.cpp | 1 - Utils/Utils All.h | 1 - Utils/message.cpp | 1 - i18n/Multi Language Graphic Utils.cpp | 1 - lua/lwstring.cpp | 1 - sgp/Button System.h | 1 + sgp/himage.cpp | 1 - sgp/sgp.cpp | 1 - sgp/soundman.cpp | 1 - sgp/types.h | 1 - 147 files changed, 16 insertions(+), 143 deletions(-) delete mode 100644 Ja2/builddefines.h diff --git a/Editor/Button Defines.h b/Editor/Button Defines.h index 991bb93cd..73b45143c 100644 --- a/Editor/Button Defines.h +++ b/Editor/Button Defines.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __BUTTON_DEFINES_H diff --git a/Editor/Cursor Modes.cpp b/Editor/Cursor Modes.cpp index a4f609790..d007aba07 100644 --- a/Editor/Cursor Modes.cpp +++ b/Editor/Cursor Modes.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Cursor Modes.h b/Editor/Cursor Modes.h index 51cd16a18..be361ac26 100644 --- a/Editor/Cursor Modes.h +++ b/Editor/Cursor Modes.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __CURSOR_MODES_H diff --git a/Editor/Editor Callback Prototypes.h b/Editor/Editor Callback Prototypes.h index 3794ab358..8a5b0b7b8 100644 --- a/Editor/Editor Callback Prototypes.h +++ b/Editor/Editor Callback Prototypes.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_CALLBACK_PROTOTYPES_H diff --git a/Editor/Editor Callbacks.cpp b/Editor/Editor Callbacks.cpp index 9590e7b48..a26235b0e 100644 --- a/Editor/Editor Callbacks.cpp +++ b/Editor/Editor Callbacks.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Editor Modes.cpp b/Editor/Editor Modes.cpp index 81d23d080..42538a93b 100644 --- a/Editor/Editor Modes.cpp +++ b/Editor/Editor Modes.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Editor Modes.h b/Editor/Editor Modes.h index de860f512..3eb2b956f 100644 --- a/Editor/Editor Modes.h +++ b/Editor/Editor Modes.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_MODES_H diff --git a/Editor/Editor Taskbar Creation.cpp b/Editor/Editor Taskbar Creation.cpp index 15f746418..28aa02549 100644 --- a/Editor/Editor Taskbar Creation.cpp +++ b/Editor/Editor Taskbar Creation.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Editor Taskbar Creation.h b/Editor/Editor Taskbar Creation.h index a91061e82..31b298d84 100644 --- a/Editor/Editor Taskbar Creation.h +++ b/Editor/Editor Taskbar Creation.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_TASKBAR_CREATION_H diff --git a/Editor/Editor Taskbar Utils.cpp b/Editor/Editor Taskbar Utils.cpp index a3944735d..7ff8241ae 100644 --- a/Editor/Editor Taskbar Utils.cpp +++ b/Editor/Editor Taskbar Utils.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Editor Taskbar Utils.h b/Editor/Editor Taskbar Utils.h index 930bb8fc1..3e833da9d 100644 --- a/Editor/Editor Taskbar Utils.h +++ b/Editor/Editor Taskbar Utils.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_TASKBAR_UTILS_H diff --git a/Editor/Editor Undo.cpp b/Editor/Editor Undo.cpp index 642d4833d..f3ad85d0e 100644 --- a/Editor/Editor Undo.cpp +++ b/Editor/Editor Undo.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Editor Undo.h b/Editor/Editor Undo.h index e399eba41..18ec00b08 100644 --- a/Editor/Editor Undo.h +++ b/Editor/Editor Undo.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_UNDO_H diff --git a/Editor/EditorBuildings.cpp b/Editor/EditorBuildings.cpp index d6ecccf23..d338ba6ce 100644 --- a/Editor/EditorBuildings.cpp +++ b/Editor/EditorBuildings.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/EditorBuildings.h b/Editor/EditorBuildings.h index 4fe900f42..95a3ddc6c 100644 --- a/Editor/EditorBuildings.h +++ b/Editor/EditorBuildings.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORBUILDINGS_H diff --git a/Editor/EditorDefines.h b/Editor/EditorDefines.h index 053c33487..05a554b13 100644 --- a/Editor/EditorDefines.h +++ b/Editor/EditorDefines.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORDEFINES_H diff --git a/Editor/EditorItems.cpp b/Editor/EditorItems.cpp index bd8751db9..bf09442c2 100644 --- a/Editor/EditorItems.cpp +++ b/Editor/EditorItems.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/EditorItems.h b/Editor/EditorItems.h index 04aff1dc1..c4a051d60 100644 --- a/Editor/EditorItems.h +++ b/Editor/EditorItems.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORITEMS_H diff --git a/Editor/EditorMapInfo.cpp b/Editor/EditorMapInfo.cpp index adec58703..51f3202bd 100644 --- a/Editor/EditorMapInfo.cpp +++ b/Editor/EditorMapInfo.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/EditorMapInfo.h b/Editor/EditorMapInfo.h index 03f93db3d..09e3a26e1 100644 --- a/Editor/EditorMapInfo.h +++ b/Editor/EditorMapInfo.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORMAPINFO_H diff --git a/Editor/EditorMercs.cpp b/Editor/EditorMercs.cpp index 21b6b500c..f3bad4e6f 100644 --- a/Editor/EditorMercs.cpp +++ b/Editor/EditorMercs.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/EditorMercs.h b/Editor/EditorMercs.h index 2644e0f54..6daf8a7e6 100644 --- a/Editor/EditorMercs.h +++ b/Editor/EditorMercs.h @@ -1,6 +1,5 @@ #pragma once -#include "builddefines.h" //----------------------------------------------- // diff --git a/Editor/EditorTerrain.cpp b/Editor/EditorTerrain.cpp index 14560d0cd..c2cb1364e 100644 --- a/Editor/EditorTerrain.cpp +++ b/Editor/EditorTerrain.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/EditorTerrain.h b/Editor/EditorTerrain.h index 8be6a062a..c7799f0c7 100644 --- a/Editor/EditorTerrain.h +++ b/Editor/EditorTerrain.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORTERRAIN_H diff --git a/Editor/Item Statistics.cpp b/Editor/Item Statistics.cpp index da20b7858..75d6867ae 100644 --- a/Editor/Item Statistics.cpp +++ b/Editor/Item Statistics.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Item Statistics.h b/Editor/Item Statistics.h index be19922dc..de1a2875c 100644 --- a/Editor/Item Statistics.h +++ b/Editor/Item Statistics.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifndef __ITEM_STATISTICS_H #define __ITEM_STATISTICS_H diff --git a/Editor/LoadScreen.cpp b/Editor/LoadScreen.cpp index eaccf839a..5cd56a3d9 100644 --- a/Editor/LoadScreen.cpp +++ b/Editor/LoadScreen.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/LoadScreen.h b/Editor/LoadScreen.h index f52160288..0c9222830 100644 --- a/Editor/LoadScreen.h +++ b/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 diff --git a/Editor/Road Smoothing.cpp b/Editor/Road Smoothing.cpp index 9c26abcde..b1825b35a 100644 --- a/Editor/Road Smoothing.cpp +++ b/Editor/Road Smoothing.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Road Smoothing.h b/Editor/Road Smoothing.h index f91f9b2f0..956f259af 100644 --- a/Editor/Road Smoothing.h +++ b/Editor/Road Smoothing.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Sector Summary.cpp b/Editor/Sector Summary.cpp index 739d09316..902c5e6ba 100644 --- a/Editor/Sector Summary.cpp +++ b/Editor/Sector Summary.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Sector Summary.h b/Editor/Sector Summary.h index 212468308..492dbf109 100644 --- a/Editor/Sector Summary.h +++ b/Editor/Sector Summary.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SECTOR_SUMMARY_H diff --git a/Editor/SmartMethod.cpp b/Editor/SmartMethod.cpp index af985cc37..fec0c6626 100644 --- a/Editor/SmartMethod.cpp +++ b/Editor/SmartMethod.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/SmartMethod.h b/Editor/SmartMethod.h index 7717e4a4b..4f55db753 100644 --- a/Editor/SmartMethod.h +++ b/Editor/SmartMethod.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SMARTMETHOD_H diff --git a/Editor/Smoothing Utils.cpp b/Editor/Smoothing Utils.cpp index b70e54539..7f1e950f7 100644 --- a/Editor/Smoothing Utils.cpp +++ b/Editor/Smoothing Utils.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Smoothing Utils.h b/Editor/Smoothing Utils.h index 325c926c1..252fb1e3a 100644 --- a/Editor/Smoothing Utils.h +++ b/Editor/Smoothing Utils.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SMOOTHING_UTILS_H diff --git a/Editor/Summary Info.h b/Editor/Summary Info.h index e8ee9be51..5b32fcb1a 100644 --- a/Editor/Summary Info.h +++ b/Editor/Summary Info.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SUMMARY_INFO_H diff --git a/Editor/edit_sys.cpp b/Editor/edit_sys.cpp index 3fa290120..316724955 100644 --- a/Editor/edit_sys.cpp +++ b/Editor/edit_sys.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/edit_sys.h b/Editor/edit_sys.h index a4f702be3..dd6ec9c85 100644 --- a/Editor/edit_sys.h +++ b/Editor/edit_sys.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDIT_SYS_H diff --git a/Editor/editscreen.cpp b/Editor/editscreen.cpp index 1510f0777..8b00ad603 100644 --- a/Editor/editscreen.cpp +++ b/Editor/editscreen.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/editscreen.h b/Editor/editscreen.h index c28c617bc..2ede5e642 100644 --- a/Editor/editscreen.h +++ b/Editor/editscreen.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef EDITSCREEN_H diff --git a/Editor/messagebox.cpp b/Editor/messagebox.cpp index 5e3221fcb..6dce41f35 100644 --- a/Editor/messagebox.cpp +++ b/Editor/messagebox.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/messagebox.h b/Editor/messagebox.h index f43e06821..dbfdbbcb1 100644 --- a/Editor/messagebox.h +++ b/Editor/messagebox.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __MESSAGEBOX_H diff --git a/Editor/newsmooth.cpp b/Editor/newsmooth.cpp index bbfc694b4..2482c9d35 100644 --- a/Editor/newsmooth.cpp +++ b/Editor/newsmooth.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/newsmooth.h b/Editor/newsmooth.h index b2889a82c..63d754c62 100644 --- a/Editor/newsmooth.h +++ b/Editor/newsmooth.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __NEWSMOOTH_H diff --git a/Editor/popupmenu.cpp b/Editor/popupmenu.cpp index 19cf5ef1b..0f122c684 100644 --- a/Editor/popupmenu.cpp +++ b/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 diff --git a/Editor/popupmenu.h b/Editor/popupmenu.h index fe5ffb19b..0d30a494c 100644 --- a/Editor/popupmenu.h +++ b/Editor/popupmenu.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR //popupmenu.h diff --git a/Editor/selectwin.cpp b/Editor/selectwin.cpp index 6eeb97cd8..c31140dd0 100644 --- a/Editor/selectwin.cpp +++ b/Editor/selectwin.cpp @@ -1,6 +1,5 @@ // WANNE: EDITOR: todo - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/selectwin.h b/Editor/selectwin.h index c5fb53888..bd338e8ac 100644 --- a/Editor/selectwin.h +++ b/Editor/selectwin.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef _SELECTION_WIN_H_ diff --git a/Editor/smooth.cpp b/Editor/smooth.cpp index b94004019..0c4255c1e 100644 --- a/Editor/smooth.cpp +++ b/Editor/smooth.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/smooth.h b/Editor/smooth.h index 9201ef7c1..9a6a229ad 100644 --- a/Editor/smooth.h +++ b/Editor/smooth.h @@ -1,4 +1,3 @@ -#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SMOOTH_H diff --git a/Ja2/Init.cpp b/Ja2/Init.cpp index 41089d337..5abfdb9a5 100644 --- a/Ja2/Init.cpp +++ b/Ja2/Init.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include "sgp.h" #include "Screens.h" diff --git a/Ja2/Sys Globals.cpp b/Ja2/Sys Globals.cpp index 53c710e5f..e21fed536 100644 --- a/Ja2/Sys Globals.cpp +++ b/Ja2/Sys Globals.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include #include diff --git a/Ja2/aniviewscreen.cpp b/Ja2/aniviewscreen.cpp index bb426b097..38e808a53 100644 --- a/Ja2/aniviewscreen.cpp +++ b/Ja2/aniviewscreen.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include #include diff --git a/Ja2/builddefines.h b/Ja2/builddefines.h deleted file mode 100644 index 9a7b11933..000000000 --- a/Ja2/builddefines.h +++ /dev/null @@ -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 diff --git a/Ja2/gamescreen.cpp b/Ja2/gamescreen.cpp index 953e8197e..0c0725dd9 100644 --- a/Ja2/gamescreen.cpp +++ b/Ja2/gamescreen.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include "sgp.h" #include "gameloop.h" diff --git a/Ja2/jascreens.cpp b/Ja2/jascreens.cpp index dc30fd437..24a6f3ae5 100644 --- a/Ja2/jascreens.cpp +++ b/Ja2/jascreens.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include "sgp.h" #include "gameloop.h" diff --git a/Ja2/profiler.cpp b/Ja2/profiler.cpp index 0918caba8..67405474c 100644 --- a/Ja2/profiler.cpp +++ b/Ja2/profiler.cpp @@ -1,6 +1,5 @@ #ifdef PROFILER_ENABLED -#include "builddefines.h" #include #ifdef PERIODIC_PROFILING diff --git a/Laptop/IMP Gear.cpp b/Laptop/IMP Gear.cpp index 82e985e11..5f01fa9c5 100644 --- a/Laptop/IMP Gear.cpp +++ b/Laptop/IMP Gear.cpp @@ -3,6 +3,7 @@ * @author Flugente (bears-pit.com) */ +#include #include "IMP Gear.h" #include "IMP Skill Trait.h" #include "Button System.h" diff --git a/Laptop/MilitiaWebsite.cpp b/Laptop/MilitiaWebsite.cpp index ff72c023e..1ef4c09ae 100644 --- a/Laptop/MilitiaWebsite.cpp +++ b/Laptop/MilitiaWebsite.cpp @@ -3,6 +3,7 @@ * @author Flugente (bears-pit.com) */ +#include #include "laptop.h" #include "insurance.h" #include "insurance Contract.h" diff --git a/Laptop/files.cpp b/Laptop/files.cpp index d37055237..e3e02422d 100644 --- a/Laptop/files.cpp +++ b/Laptop/files.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include #include "laptop.h" diff --git a/Laptop/merccompare.cpp b/Laptop/merccompare.cpp index 6b1797b1e..1dd243d30 100644 --- a/Laptop/merccompare.cpp +++ b/Laptop/merccompare.cpp @@ -3,6 +3,7 @@ * @author Flugente (bears-pit.com) */ +#include #include "laptop.h" #include "insurance.h" #include "insurance Contract.h" diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index 41296acce..f5fc13d4f 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include "Bullets.h" #include #include diff --git a/Multiplayer/connect.h b/Multiplayer/connect.h index 816e12d3f..3f0da50c4 100644 --- a/Multiplayer/connect.h +++ b/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; diff --git a/Strategic/AI Viewer.cpp b/Strategic/AI Viewer.cpp index bdd006a20..f70c81971 100644 --- a/Strategic/AI Viewer.cpp +++ b/Strategic/AI Viewer.cpp @@ -1,6 +1,5 @@ //Strategic AI Viewer - #include "builddefines.h" #include #include "types.h" #include "english.h" diff --git a/Strategic/ASD.cpp b/Strategic/ASD.cpp index bc60c0bc9..642a883c3 100644 --- a/Strategic/ASD.cpp +++ b/Strategic/ASD.cpp @@ -3,6 +3,7 @@ * @author Flugente (bears-pit.com) */ +#include #include #include "ASD.h" #include "strategic.h" diff --git a/Strategic/ASD.h b/Strategic/ASD.h index 530c611c7..eb49150dc 100644 --- a/Strategic/ASD.h +++ b/Strategic/ASD.h @@ -6,6 +6,8 @@ * @author Flugente (bears-pit.com) */ +#include +#include #include "types.h" /** Flugente: Arulco special division decision code diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp index 35bf746e9..5585b9f7f 100644 --- a/Strategic/Auto Resolve.cpp +++ b/Strategic/Auto Resolve.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include "types.h" #include "Auto Resolve.h" diff --git a/Strategic/Campaign Types.h b/Strategic/Campaign Types.h index 2c490fcbc..833f4e3ae 100644 --- a/Strategic/Campaign Types.h +++ b/Strategic/Campaign Types.h @@ -1,6 +1,7 @@ #ifndef __CAMPAIGN_TYPES_H #define __CAMPAIGN_TYPES_H +#include #include "types.h" #include "DEBUG.H" #include diff --git a/Strategic/Facilities.cpp b/Strategic/Facilities.cpp index 731efa26d..2f9bd771f 100644 --- a/Strategic/Facilities.cpp +++ b/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" diff --git a/Strategic/Game Event Hook.h b/Strategic/Game Event Hook.h index fa9cacd98..03ebfb996 100644 --- a/Strategic/Game Event Hook.h +++ b/Strategic/Game Event Hook.h @@ -1,6 +1,7 @@ #ifndef __GAME_EVENT_HOOK_H #define __GAME_EVENT_HOOK_H +#include #include "types.h" enum diff --git a/Strategic/Game Events.cpp b/Strategic/Game Events.cpp index 413622c52..ebfa48828 100644 --- a/Strategic/Game Events.cpp +++ b/Strategic/Game Events.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "types.h" #include "Game Events.h" diff --git a/Strategic/Ja25 Strategic Ai.cpp b/Strategic/Ja25 Strategic Ai.cpp index 611ac771b..2788a7cf2 100644 --- a/Strategic/Ja25 Strategic Ai.cpp +++ b/Strategic/Ja25 Strategic Ai.cpp @@ -1,5 +1,4 @@ #ifdef JA2UB -#include "builddefines.h" #include "strategicmap.h" #include "strategic.h" diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp index b0fd4bcbd..fdb6974e5 100644 --- a/Strategic/Map Screen Interface Map.cpp +++ b/Strategic/Map Screen Interface Map.cpp @@ -1,3 +1,4 @@ +#include #include "Font.h" #include "Font Control.h" #include "mapscreen.h" diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index 36784ce4c..f3977be34 100644 --- a/Strategic/Merc Contract.cpp +++ b/Strategic/Merc Contract.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "types.h" #include "Merc Contract.h" diff --git a/Strategic/PreBattle Interface.cpp b/Strategic/PreBattle Interface.cpp index 94c510699..9602ae2db 100644 --- a/Strategic/PreBattle Interface.cpp +++ b/Strategic/PreBattle Interface.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "PreBattle Interface.h" #include "Button System.h" diff --git a/Strategic/Quest Debug System.cpp b/Strategic/Quest Debug System.cpp index 2608ec308..dde8a610c 100644 --- a/Strategic/Quest Debug System.cpp +++ b/Strategic/Quest Debug System.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "types.h" #include "Quest Debug System.h" diff --git a/Strategic/Scheduling.h b/Strategic/Scheduling.h index e35ef34af..17a5cfa59 100644 --- a/Strategic/Scheduling.h +++ b/Strategic/Scheduling.h @@ -1,7 +1,6 @@ #ifndef __SCHEDULING_H #define __SCHEDULING_H -#include "builddefines.h" #include "Soldier Init List.h" //Merc scheduling actions diff --git a/Strategic/Strategic AI.cpp b/Strategic/Strategic AI.cpp index 768276eb0..cc28f5ded 100644 --- a/Strategic/Strategic AI.cpp +++ b/Strategic/Strategic AI.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "types.h" #include "Strategic Movement.h" diff --git a/Strategic/Strategic Movement.cpp b/Strategic/Strategic Movement.cpp index ab1938fd0..cec0f1b12 100644 --- a/Strategic/Strategic Movement.cpp +++ b/Strategic/Strategic Movement.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "Strategic Movement.h" #include "MemMan.h" diff --git a/Strategic/Strategic Town Loyalty.cpp b/Strategic/Strategic Town Loyalty.cpp index 53eb95408..48d2f9f05 100644 --- a/Strategic/Strategic Town Loyalty.cpp +++ b/Strategic/Strategic Town Loyalty.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "Strategic Town Loyalty.h" #include "strategicmap.h" diff --git a/Strategic/Strategic Transport Groups.cpp b/Strategic/Strategic Transport Groups.cpp index e385d6b56..b3f45b1d4 100644 --- a/Strategic/Strategic Transport Groups.cpp +++ b/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 #include "Strategic Transport Groups.h" #include "ASD.h" diff --git a/Strategic/Town Militia.cpp b/Strategic/Town Militia.cpp index 0e2947537..b33677905 100644 --- a/Strategic/Town Militia.cpp +++ b/Strategic/Town Militia.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "Town Militia.h" #include "Militia Control.h" diff --git a/Strategic/XML_Army.cpp b/Strategic/XML_Army.cpp index 4eb965670..f69cc517e 100644 --- a/Strategic/XML_Army.cpp +++ b/Strategic/XML_Army.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include "XML.h" diff --git a/Strategic/XML_Bloodcats.cpp b/Strategic/XML_Bloodcats.cpp index 13115fe92..aaab82f74 100644 --- a/Strategic/XML_Bloodcats.cpp +++ b/Strategic/XML_Bloodcats.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "XML.h" #include "expat.h" diff --git a/Strategic/XML_CoolnessBySector.cpp b/Strategic/XML_CoolnessBySector.cpp index e53b7d8e7..642d95111 100644 --- a/Strategic/XML_CoolnessBySector.cpp +++ b/Strategic/XML_CoolnessBySector.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "XML.h" #include "expat.h" diff --git a/Strategic/XML_ExtraItems.cpp b/Strategic/XML_ExtraItems.cpp index db41b14af..cee77734d 100644 --- a/Strategic/XML_ExtraItems.cpp +++ b/Strategic/XML_ExtraItems.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include "XML.h" #include "expat.h" diff --git a/Strategic/XML_SectorNames.cpp b/Strategic/XML_SectorNames.cpp index f44e6a726..ef7c216a1 100644 --- a/Strategic/XML_SectorNames.cpp +++ b/Strategic/XML_SectorNames.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "XML.h" #include "expat.h" diff --git a/Strategic/XML_UniformColors.cpp b/Strategic/XML_UniformColors.cpp index 9acd9f8f9..3fba2bad0 100644 --- a/Strategic/XML_UniformColors.cpp +++ b/Strategic/XML_UniformColors.cpp @@ -8,7 +8,6 @@ ////////////////////////////////////////////////////////////// - #include "builddefines.h" #include #include "XML.h" #include "expat.h" diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index 0714bfb9d..5dc81d17b 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "strategicmap.h" #include "strategic.h" diff --git a/Tactical/Animation Data.cpp b/Tactical/Animation Data.cpp index cdd205f98..5f1bcb5a0 100644 --- a/Tactical/Animation Data.cpp +++ b/Tactical/Animation Data.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include #include "WCheck.h" diff --git a/Tactical/Arms Dealer Init.cpp b/Tactical/Arms Dealer Init.cpp index 7cd5d9278..b29695715 100644 --- a/Tactical/Arms Dealer Init.cpp +++ b/Tactical/Arms Dealer Init.cpp @@ -1,3 +1,4 @@ +#include #include "types.h" #include #include "Arms Dealer Init.h" diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp index 41922cbc0..8235250c6 100644 --- a/Tactical/Campaign.cpp +++ b/Tactical/Campaign.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "DEBUG.H" #include "Overhead Types.h" diff --git a/Tactical/Civ Quotes.cpp b/Tactical/Civ Quotes.cpp index 7ae3609d3..c0003def3 100644 --- a/Tactical/Civ Quotes.cpp +++ b/Tactical/Civ Quotes.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include "types.h" #include "Civ Quotes.h" diff --git a/Tactical/Enemy Soldier Save.cpp b/Tactical/Enemy Soldier Save.cpp index 351223d35..95503e768 100644 --- a/Tactical/Enemy Soldier Save.cpp +++ b/Tactical/Enemy Soldier Save.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include "GameSettings.h" #include #include "types.h" diff --git a/Tactical/Faces.cpp b/Tactical/Faces.cpp index 242a4deef..48052e091 100644 --- a/Tactical/Faces.cpp +++ b/Tactical/Faces.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "worlddef.h" diff --git a/Tactical/Handle Items.h b/Tactical/Handle Items.h index d43a42b57..60ad66a26 100644 --- a/Tactical/Handle Items.h +++ b/Tactical/Handle Items.h @@ -1,6 +1,7 @@ #ifndef __HANDLE_ITEMS_H #define __HANDLE_ITEMS_H +#include #include "World Items.h" #include "structure.h" #include "Soldier Control.h" diff --git a/Tactical/Interface Dialogue.cpp b/Tactical/Interface Dialogue.cpp index edb78e255..ac4d449f5 100644 --- a/Tactical/Interface Dialogue.cpp +++ b/Tactical/Interface Dialogue.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #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 diff --git a/Tactical/Interface Enhanced.cpp b/Tactical/Interface Enhanced.cpp index c65a6d676..00728e55d 100644 --- a/Tactical/Interface Enhanced.cpp +++ b/Tactical/Interface Enhanced.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "sgp.h" #include "vobject.h" diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 5b0b1aff6..72c118731 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include "mapscreen.h" #include #include "sgp.h" diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index e1714d91c..f940b17e9 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "sgp.h" #include "himage.h" diff --git a/Tactical/Interface.cpp b/Tactical/Interface.cpp index 2d6c8ee8e..5a8b97dd7 100644 --- a/Tactical/Interface.cpp +++ b/Tactical/Interface.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include #include "sgp.h" diff --git a/Tactical/Keys.cpp b/Tactical/Keys.cpp index cb8d5ab91..f2f099a5a 100644 --- a/Tactical/Keys.cpp +++ b/Tactical/Keys.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include "types.h" #include "Keys.h" #include "DEBUG.H" diff --git a/Tactical/LOS.cpp b/Tactical/LOS.cpp index 0d5836332..76645f194 100644 --- a/Tactical/LOS.cpp +++ b/Tactical/LOS.cpp @@ -1,5 +1,4 @@ #include "connect.h" -#include "builddefines.h" #include #include #include "WCheck.h" diff --git a/Tactical/Merc Hiring.cpp b/Tactical/Merc Hiring.cpp index 40b91bf2f..0772bcf08 100644 --- a/Tactical/Merc Hiring.cpp +++ b/Tactical/Merc Hiring.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "DEBUG.H" #include "math.h" diff --git a/Tactical/Minigame.cpp b/Tactical/Minigame.cpp index a1a1ca5cc..41c5d7768 100644 --- a/Tactical/Minigame.cpp +++ b/Tactical/Minigame.cpp @@ -3,7 +3,6 @@ * @author Flugente (bears-pit.com) */ -#include "builddefines.h" #include #include "sgp.h" #include "gameloop.h" diff --git a/Tactical/Rotting Corpses.cpp b/Tactical/Rotting Corpses.cpp index 51bf16b92..547ddb118 100644 --- a/Tactical/Rotting Corpses.cpp +++ b/Tactical/Rotting Corpses.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include #include "WCheck.h" diff --git a/Tactical/ShopKeeper Interface.cpp b/Tactical/ShopKeeper Interface.cpp index 85e013f94..93f241dc1 100644 --- a/Tactical/ShopKeeper Interface.cpp +++ b/Tactical/ShopKeeper Interface.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "types.h" #include "ShopKeeper Interface.h" #include "Utilities.h" diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 85ef12836..b2a1a4118 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -1,5 +1,4 @@ #include "Soldier Functions.h" -#include "builddefines.h" #include #include #include diff --git a/Tactical/Soldier Init List.cpp b/Tactical/Soldier Init List.cpp index b0d3455cb..2e93b16e3 100644 --- a/Tactical/Soldier Init List.cpp +++ b/Tactical/Soldier Init List.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include "types.h" #include "strategicmap.h" diff --git a/Tactical/Strategic Exit GUI.cpp b/Tactical/Strategic Exit GUI.cpp index 1713467e6..b11356fc9 100644 --- a/Tactical/Strategic Exit GUI.cpp +++ b/Tactical/Strategic Exit GUI.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "Button System.h" #include "mousesystem.h" diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index 1c7fe654d..d5fc07de9 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include "stdlib.h" #include "DEBUG.H" diff --git a/TileEngine/Ambient Control.cpp b/TileEngine/Ambient Control.cpp index a7fd854c8..a8f5956e5 100644 --- a/TileEngine/Ambient Control.cpp +++ b/TileEngine/Ambient Control.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "Ambient Control.h" #include "Sound Control.h" diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp index 0ec1a05b6..2016d7ccc 100644 --- a/TileEngine/Explosion Control.cpp +++ b/TileEngine/Explosion Control.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "WorldDat.h" #include "DEBUG.H" #include "Weapons.h" diff --git a/TileEngine/Interactive Tiles.cpp b/TileEngine/Interactive Tiles.cpp index e3436c055..18fc74c8c 100644 --- a/TileEngine/Interactive Tiles.cpp +++ b/TileEngine/Interactive Tiles.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "sysutil.h" #include "renderworld.h" diff --git a/TileEngine/LightEffects.cpp b/TileEngine/LightEffects.cpp index dcc072942..e4888f5e3 100644 --- a/TileEngine/LightEffects.cpp +++ b/TileEngine/LightEffects.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "DEBUG.H" #include "Animation Control.h" diff --git a/TileEngine/Radar Screen.cpp b/TileEngine/Radar Screen.cpp index b59f6c67d..a13cff749 100644 --- a/TileEngine/Radar Screen.cpp +++ b/TileEngine/Radar Screen.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "sgp.h" #include "Radar Screen.h" diff --git a/TileEngine/Render Dirty.cpp b/TileEngine/Render Dirty.cpp index 864e1b80e..6d36ccc89 100644 --- a/TileEngine/Render Dirty.cpp +++ b/TileEngine/Render Dirty.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "worlddef.h" #include "Render Dirty.h" diff --git a/TileEngine/Shade Table Util.cpp b/TileEngine/Shade Table Util.cpp index 6827c3c7d..ffca4ae62 100644 --- a/TileEngine/Shade Table Util.cpp +++ b/TileEngine/Shade Table Util.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include "types.h" diff --git a/TileEngine/SmokeEffects.cpp b/TileEngine/SmokeEffects.cpp index 30b432ba3..53c39a9e2 100644 --- a/TileEngine/SmokeEffects.cpp +++ b/TileEngine/SmokeEffects.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include diff --git a/TileEngine/Tactical Placement GUI.cpp b/TileEngine/Tactical Placement GUI.cpp index 8819c6fd8..89f7dea5f 100644 --- a/TileEngine/Tactical Placement GUI.cpp +++ b/TileEngine/Tactical Placement GUI.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" // WANNE 2 diff --git a/TileEngine/Tile Cache.cpp b/TileEngine/Tile Cache.cpp index ee8f4dd59..6f3991392 100644 --- a/TileEngine/Tile Cache.cpp +++ b/TileEngine/Tile Cache.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "DEBUG.H" #include "Debug Control.h" diff --git a/TileEngine/Tile Surface.cpp b/TileEngine/Tile Surface.cpp index 4cbb20621..9c53dbf7e 100644 --- a/TileEngine/Tile Surface.cpp +++ b/TileEngine/Tile Surface.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "DEBUG.H" #include "Sys Globals.h" diff --git a/TileEngine/WorldDat.cpp b/TileEngine/WorldDat.cpp index e1290a2d8..c0eb72003 100644 --- a/TileEngine/WorldDat.cpp +++ b/TileEngine/WorldDat.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "WorldDat.h" #include "Sys Globals.h" diff --git a/TileEngine/XML_ExplosionData.cpp b/TileEngine/XML_ExplosionData.cpp index d02032150..101343b75 100644 --- a/TileEngine/XML_ExplosionData.cpp +++ b/TileEngine/XML_ExplosionData.cpp @@ -1,5 +1,4 @@ // Lesh: -#include "builddefines.h" #include #include diff --git a/TileEngine/lighting.cpp b/TileEngine/lighting.cpp index edb1b6c5a..e36d2dcf2 100644 --- a/TileEngine/lighting.cpp +++ b/TileEngine/lighting.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" /**************************************************************************************** * JA2 Lighting Module diff --git a/TileEngine/overhead map.cpp b/TileEngine/overhead map.cpp index 4bda376b9..5c9e7e526 100644 --- a/TileEngine/overhead map.cpp +++ b/TileEngine/overhead map.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "WorldDat.h" #include "sysutil.h" diff --git a/TileEngine/physics.cpp b/TileEngine/physics.cpp index dc09c9349..57da4357b 100644 --- a/TileEngine/physics.cpp +++ b/TileEngine/physics.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "physics.h" #include "WCheck.h" diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp index 6919a1b37..d2b9e1835 100644 --- a/TileEngine/renderworld.cpp +++ b/TileEngine/renderworld.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" /////////////////////////// // C file include here #include "Render Z.h" diff --git a/TileEngine/worlddef.cpp b/TileEngine/worlddef.cpp index 6705b2950..14778e0db 100644 --- a/TileEngine/worlddef.cpp +++ b/TileEngine/worlddef.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "worlddef.h" #include "WorldDat.h" diff --git a/Utils/Cursors.cpp b/Utils/Cursors.cpp index e6639e96c..9736367e6 100644 --- a/Utils/Cursors.cpp +++ b/Utils/Cursors.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include "sgp.h" #include "Cursors.h" diff --git a/Utils/Font Control.h b/Utils/Font Control.h index 368de6de1..d25526410 100644 --- a/Utils/Font Control.h +++ b/Utils/Font Control.h @@ -1,7 +1,6 @@ #ifndef __FONT_CONTROL_H #define __FONT_CONTROL_H -#include "builddefines.h" #include "Font.h" extern BOOLEAN gfUseWinFonts; diff --git a/Utils/INIReader.cpp b/Utils/INIReader.cpp index be2893b4f..10a2dbec1 100644 --- a/Utils/INIReader.cpp +++ b/Utils/INIReader.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "INIReader.h" #include "FileMan.h" #include "DEBUG.H" diff --git a/Utils/INIReader.h b/Utils/INIReader.h index 440d2868c..e90de4f08 100644 --- a/Utils/INIReader.h +++ b/Utils/INIReader.h @@ -1,6 +1,7 @@ #ifndef INIREADER_H #define INIREADER_H #define NOMINMAX +#include #include #include #include diff --git a/Utils/Multilingual Text Code Generator.cpp b/Utils/Multilingual Text Code Generator.cpp index c3eb26d34..e7208200b 100644 --- a/Utils/Multilingual Text Code Generator.cpp +++ b/Utils/Multilingual Text Code Generator.cpp @@ -29,7 +29,6 @@ CREATED: Feb 16, 1999 #ifdef _DEBUG -#include "builddefines.h" #include #include "types.h" #include "DEBUG.H" diff --git a/Utils/Music Control.h b/Utils/Music Control.h index 2d67f5d04..a65d6e2c5 100644 --- a/Utils/Music Control.h +++ b/Utils/Music Control.h @@ -1,6 +1,7 @@ #ifndef _MUSIC_CONTROL_H_ #define _MUSIC_CONTROL_H_ +#include #include "Overhead Types.h" enum MusicMode diff --git a/Utils/STIConvert.cpp b/Utils/STIConvert.cpp index caf3b0c9e..4965a150d 100644 --- a/Utils/STIConvert.cpp +++ b/Utils/STIConvert.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include #include diff --git a/Utils/Text Input.cpp b/Utils/Text Input.cpp index 75aff20e8..f6b9904bd 100644 --- a/Utils/Text Input.cpp +++ b/Utils/Text Input.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include #include diff --git a/Utils/Utils All.h b/Utils/Utils All.h index 9547c5ee4..e9a792408 100644 --- a/Utils/Utils All.h +++ b/Utils/Utils All.h @@ -64,7 +64,6 @@ #include "local.h" #include "Map Screen Interface Bottom.h" #include "soundman.h" -#include "builddefines.h" #include "Dialogue Control.h" #include "Multi Language Graphic Utils.h" #include "random.h" diff --git a/Utils/message.cpp b/Utils/message.cpp index f9e2a0537..dbeda1289 100644 --- a/Utils/message.cpp +++ b/Utils/message.cpp @@ -15,7 +15,6 @@ #include "WordWrap.h" #include "Sound Control.h" #include "soundman.h" - #include "builddefines.h" #include "Dialogue Control.h" #include #include "Game Clock.h" diff --git a/i18n/Multi Language Graphic Utils.cpp b/i18n/Multi Language Graphic Utils.cpp index 31f39fe50..dbae01738 100644 --- a/i18n/Multi Language Graphic Utils.cpp +++ b/i18n/Multi Language Graphic Utils.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include "stdio.h" #include "windows.h" #include "types.h" diff --git a/lua/lwstring.cpp b/lua/lwstring.cpp index 2e25f384d..41b8bd4e7 100644 --- a/lua/lwstring.cpp +++ b/lua/lwstring.cpp @@ -1,4 +1,3 @@ -#include "builddefines.h" #include #include "MemMan.h" diff --git a/sgp/Button System.h b/sgp/Button System.h index c1c074d6e..2fce24d06 100644 --- a/sgp/Button System.h +++ b/sgp/Button System.h @@ -7,6 +7,7 @@ #ifndef __BUTTON_SYSTEM_H #define __BUTTON_SYSTEM_H +#include #include "vobject.h" #include "mousesystem.h" #include "soundman.h" diff --git a/sgp/himage.cpp b/sgp/himage.cpp index 71582fca8..d04b83db0 100644 --- a/sgp/himage.cpp +++ b/sgp/himage.cpp @@ -1,4 +1,3 @@ - #include "builddefines.h" #include #include #include "types.h" diff --git a/sgp/sgp.cpp b/sgp/sgp.cpp index f47dd0e34..a03da89a3 100644 --- a/sgp/sgp.cpp +++ b/sgp/sgp.cpp @@ -1,6 +1,5 @@ /* $Id: sgp.c,v 1.4 2004/03/19 06:16:04 digicrab Exp $ */ //its test what doeas it do? -#include "builddefines.h" #include "types.h" #include #include diff --git a/sgp/soundman.cpp b/sgp/soundman.cpp index b8def812e..df53e03ff 100644 --- a/sgp/soundman.cpp +++ b/sgp/soundman.cpp @@ -6,7 +6,6 @@ * Derek Beland, May 28, 1997 * *********************************************************************************/ - #include "builddefines.h" #include #include #include "soundman.h" diff --git a/sgp/types.h b/sgp/types.h index 5ccea912f..283a80262 100644 --- a/sgp/types.h +++ b/sgp/types.h @@ -15,7 +15,6 @@ // build defines header.... -#include "builddefines.h"