Skip to content

Fixes Upper/Lower Casing for include paths #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
majcosta merged 5 commits into from
Aug 17, 2025
Merged

Fixes Upper/Lower Casing for include paths #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf1ec67
Fixing upper/lower case for includes - Phase 1
BeatAroundTheBuscher Aug 15, 2025
fbf5c36
Fixing upper/lower case for includes - Phase 2
BeatAroundTheBuscher Aug 15, 2025
3bbb950
Fixed includes for JA2BETAVERSION JA2EDITOR JA2UB JA2UBMAPS
BeatAroundTheBuscher Aug 15, 2025
861e78a
Revert BobbyRGuns.cpp
BeatAroundTheBuscher Aug 16, 2025
e66e6ec
Fix BobbyRGuns.cpp for Upper/Lower casing
BeatAroundTheBuscher Aug 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ include_directories(
"${CMAKE_SOURCE_DIR}/Strategic"
"${CMAKE_SOURCE_DIR}/sgp"
"${CMAKE_SOURCE_DIR}/Ja2/Res"
"${CMAKE_SOURCE_DIR}/Lua"
"${CMAKE_SOURCE_DIR}/lua"
"${CMAKE_SOURCE_DIR}/Laptop"
"${CMAKE_SOURCE_DIR}/Multiplayer"
"${CMAKE_SOURCE_DIR}/Editor"
Expand Down
2 changes: 1 addition & 1 deletion Console/Cursors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
// Cursors.h - cursor classes

//#include "stdafx.h"
#include <Windows.h>
#include <windows.h>
#include <tchar.h>
#include "Cursors.h"

Expand Down
2 changes: 1 addition & 1 deletion Console/Dialogs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
// About dialog class, etc...

//#include "stdafx.h"
#include <Windows.h>
#include <windows.h>

#include "resource.h"
#include "Console.h"
Expand Down
2 changes: 1 addition & 1 deletion Console/FileStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

//#include "stdafx.h"
//#include <atlbase.h>
#include <Windows.h>
#include <windows.h>
#include <objidl.h>
#include "FileStream.h"

Expand Down
2 changes: 1 addition & 1 deletion Editor/Button Defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __BUTTON_DEFINES_H
Expand Down
2 changes: 1 addition & 1 deletion Editor/Cursor Modes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "renderworld.h"
#include "random.h"
#include "worldman.h"
#include "interface.h"
#include "Interface.h"
#include "Isometric Utils.h"
#include "editscreen.h"
#include "EditorDefines.h"
Expand Down
2 changes: 1 addition & 1 deletion Editor/Cursor Modes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __CURSOR_MODES_H
Expand Down
2 changes: 1 addition & 1 deletion Editor/Editor Callback Prototypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __EDITOR_CALLBACK_PROTOTYPES_H
Expand Down
2 changes: 1 addition & 1 deletion Editor/Editor Modes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "environment.h"
#include "worlddef.h"
#include "Exit Grids.h"
#include "Worldman.h"
#include "worldman.h"

BOOLEAN gfShowExitGrids = FALSE;

Expand Down
2 changes: 1 addition & 1 deletion Editor/Editor Modes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __EDITOR_MODES_H
Expand Down
4 changes: 2 additions & 2 deletions Editor/Editor Taskbar Creation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//sgp
#include "Button System.h"
#include "Font Control.h"
#include "debug.h"
#include "DEBUG.H"
//editor
#include "EditorDefines.h"
#include "Editor Callback Prototypes.h"
Expand All @@ -14,7 +14,7 @@
#include "EditorMapInfo.h"
//tactical
#include "Soldier Create.h"
#include "overhead types.h"
#include "Overhead Types.h"
#include "local.h"
#include "Text.h"

Expand Down
2 changes: 1 addition & 1 deletion Editor/Editor Taskbar Creation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __EDITOR_TASKBAR_CREATION_H
Expand Down
4 changes: 2 additions & 2 deletions Editor/Editor Taskbar Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
#include "WorldDat.h"
#include "Render Dirty.h"
#include "sysutil.h"
#include "wordwrap.h"
#include "WordWrap.h"
#include "environment.h"
#include "Interface Items.h"
#include "Soldier Find.h"
#include "World Items.h"
#include "Text.h"
#include "Overhead map.h"
#include "overhead map.h"
#include "Cursor Modes.h"
#include "editscreen.h"
#include "EditorTerrain.h"
Expand Down
2 changes: 1 addition & 1 deletion Editor/Editor Taskbar Utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __EDITOR_TASKBAR_UTILS_H
Expand Down
4 changes: 2 additions & 2 deletions Editor/Editor Undo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "worldman.h"
#include "smooth.h"
#include "input.h"
#include "debug.h"
#include "DEBUG.H"
#include "Isometric Utils.h"

#include "editscreen.h"
Expand All @@ -15,7 +15,7 @@
#include "Cursor Modes.h"
#include "Exit Grids.h"
//dnl ch86 110214
#include "keys.h"
#include "Keys.h"
#include "EditorItems.h"
#include "EditorMapInfo.h"

Expand Down
2 changes: 1 addition & 1 deletion Editor/Editor Undo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __EDITOR_UNDO_H
Expand Down
2 changes: 1 addition & 1 deletion Editor/EditorBuildings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "Editor Modes.h"
#include "Smoothing Utils.h"
#include "Text Input.h"
#include "keys.h"
#include "Keys.h"
#include "environment.h"
#include "selectwin.h"
#include "Simple Render Utils.h"
Expand Down
2 changes: 1 addition & 1 deletion Editor/EditorBuildings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __EDITORBUILDINGS_H
Expand Down
4 changes: 2 additions & 2 deletions Editor/EditorDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __EDITORDEFINES_H
#define __EDITORDEFINES_H

#include "Types.h"
#include "types.h"
#include "Button Defines.h"


Expand Down
20 changes: 10 additions & 10 deletions Editor/EditorItems.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,34 @@
#include "vobject.h"
#include "mousesystem.h"
#include "Button System.h"
#include "wcheck.h"
#include "WCheck.h"
#include "vsurface.h"
#include "input.h"
#include "sysutil.h"
#include "font.h"
#include "Font.h"
#include "Font Control.h"
#include "editscreen.h"
#include "selectwin.h"
#include "video.h"
#include "vobject_blitters.h"
#include "interface panels.h"
#include "interface items.h"
#include "text.h"
#include "utilities.h"
#include "Interface Panels.h"
#include "Interface Items.h"
#include "Text.h"
#include "Utilities.h"
#include "Action Items.h"
#include "World Items.h"
#include "EditorDefines.h"
#include "EditorItems.h"
#include "EditorMercs.h"
#include "weapons.h"
#include "Weapons.h"
#include "Editor Taskbar Utils.h"
#include "wordwrap.h"
#include "WordWrap.h"
#include "Item Statistics.h"
#include "Simple Render Utils.h"
#include "worldman.h"
#include "random.h"
#include "Pits.h"
#include "keys.h"
#include "pits.h"
#include "Keys.h"
#include "InterfaceItemImages.h"
#include "Editor Undo.h"//dnl ch86 220214

Expand Down
2 changes: 1 addition & 1 deletion Editor/EditorItems.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __EDITORITEMS_H
Expand Down
18 changes: 9 additions & 9 deletions Editor/EditorMapInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
#include "vobject.h"
#include "mousesystem.h"
#include "Button System.h"
#include "wcheck.h"
#include "WCheck.h"
#include "vsurface.h"
#include "line.h"
#include "input.h"
#include "sysutil.h"
#include "font.h"
#include "Font.h"
#include "Font Control.h"
#include "editscreen.h"
#include "selectwin.h"
#include "video.h"
#include "vobject_blitters.h"
#include "interface panels.h"
#include "interface items.h"
#include "utilities.h"
#include "Interface Panels.h"
#include "Interface Items.h"
#include "Utilities.h"
#include "World Items.h"
#include "worldman.h"
#include "overhead.h" //GetSoldier
#include "Overhead.h" //GetSoldier
#include "renderworld.h"
#include "Animation Data.h"
#include "Animation Control.h"
Expand All @@ -37,11 +37,11 @@
#include "Soldier Init List.h"
#include "strategicmap.h"
#include "Soldier Add.h"
#include "Soldier Profile Type.h"
#include "soldier profile type.h"
#include "Soldier Profile.h"
#include "Text Input.h"
#include "Random.h"
#include "wordwrap.h"
#include "random.h"
#include "WordWrap.h"
#include "EditorItems.h"
#include "Editor Taskbar Utils.h"
#include "Exit Grids.h"
Expand Down
2 changes: 1 addition & 1 deletion Editor/EditorMapInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __EDITORMAPINFO_H
Expand Down
20 changes: 10 additions & 10 deletions Editor/EditorMercs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
#include "vobject.h"
#include "mousesystem.h"
#include "Button System.h"
#include "wcheck.h"
#include "WCheck.h"
#include "vsurface.h"
#include "line.h"
#include "input.h"
#include "sysutil.h"
#include "font.h"
#include "Font.h"
#include "Font Control.h"
#include "editscreen.h"
#include "selectwin.h"
#include "video.h"
#include "vobject_blitters.h"
#include "interface panels.h"
#include "interface items.h"
#include "text.h"
#include "utilities.h"
#include "Interface Panels.h"
#include "Interface Items.h"
#include "Text.h"
#include "Utilities.h"
#include "World Items.h"
#include "worldman.h"
#include "overhead.h" //GetSoldier
#include "Overhead.h" //GetSoldier
#include "renderworld.h"
#include "Animation Data.h"
#include "Animation Control.h"
Expand All @@ -39,11 +39,11 @@
#include "Soldier Init List.h"
#include "strategicmap.h"
#include "Soldier Add.h"
#include "Soldier Profile Type.h"
#include "soldier profile type.h"
#include "Soldier Profile.h"
#include "Text Input.h"
#include "Random.h"
#include "wordwrap.h"
#include "random.h"
#include "WordWrap.h"
#include "EditorItems.h"
#include "Editor Taskbar Utils.h"
#include "Exit Grids.h"
Expand Down
2 changes: 1 addition & 1 deletion Editor/EditorMercs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "BuildDefines.h"
#include "builddefines.h"

//-----------------------------------------------
//
Expand Down
8 changes: 4 additions & 4 deletions Editor/EditorTerrain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
#include "vobject.h"
#include "mousesystem.h"
#include "Button System.h"
#include "wcheck.h"
#include "WCheck.h"
#include "vsurface.h"
#include "input.h"
#include "sysutil.h"
#include "font.h"
#include "Font.h"
#include "Font Control.h"
#include "editscreen.h"
#include "selectwin.h"
#include "video.h"
#include "vobject_blitters.h"
#include "interface panels.h"
#include "utilities.h"
#include "Interface Panels.h"
#include "Utilities.h"
#include "World Items.h"
#include "EditorDefines.h"
#include "EditorTerrain.h"
Expand Down
2 changes: 1 addition & 1 deletion Editor/EditorTerrain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifdef JA2EDITOR
#ifndef __EDITORTERRAIN_H
Expand Down
6 changes: 3 additions & 3 deletions Editor/Item Statistics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "types.h"
#include "mousesystem.h"
#include "Button System.h"
#include "font control.h"
#include "Font Control.h"
#include "EditorDefines.h"
#include "Editor Taskbar Utils.h"
#include "EditorMercs.h"
Expand All @@ -20,10 +20,10 @@
#include "Weapons.h"
#include "Items.h"
#include "editscreen.h"
#include "Random.h"
#include "random.h"
#include "Handle Items.h"
#include "World Items.h"
#include "PopupMenu.h"
#include "popupmenu.h"
#include "pits.h"
#include "Text.h"

Expand Down
2 changes: 1 addition & 1 deletion Editor/Item Statistics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BuildDefines.h"
#include "builddefines.h"

#ifndef __ITEM_STATISTICS_H
#define __ITEM_STATISTICS_H
Expand Down
Loading