Skip to content

chore: Use qualified include paths for WWVegas headers (2)#2881

Open
CryoTheRenegade wants to merge 1 commit into
TheSuperHackers:mainfrom
CryoTheRenegade:refactor/wwvegas-game-headers-part2
Open

chore: Use qualified include paths for WWVegas headers (2)#2881
CryoTheRenegade wants to merge 1 commit into
TheSuperHackers:mainfrom
CryoTheRenegade:refactor/wwvegas-game-headers-part2

Conversation

@CryoTheRenegade

@CryoTheRenegade CryoTheRenegade commented Jul 16, 2026

Copy link
Copy Markdown

Qualifies WWVegas component header includes throughout Generals and Zero Hour, then removes the obsolete component include directories. This is part 2 of 2 and must merge after #2880.

@greptile-apps

greptile-apps Bot commented Jul 16, 2026

Copy link
Copy Markdown

Greptile Summary

This PR qualifies WWVegas header paths and removes obsolete component include directories. The main changes are:

  • Updates WWVegas includes to use component-qualified paths.
  • Simplifies WWVegas CMake include exports.
  • Updates Generals, Zero Hour, and tool build targets.

Confidence Score: 5/5

This looks safe to merge.

  • No blocking issues found in the changed code.

Important Files Changed

Filename Overview
Core/Libraries/Source/WWVegas/CMakeLists.txt Exports the WWVegas root include directory instead of individual component directories.
Core/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt Removes the redundant WWAudio include-directory export while retaining its shared WWVegas dependency.
Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt Qualifies WWLib precompiled-header paths.

Reviews (6): Last reviewed commit: "refactor(Game): Qualify WWVegas componen..." | Re-trigger Greptile

@CryoTheRenegade
CryoTheRenegade force-pushed the refactor/wwvegas-game-headers-part2 branch from 927d465 to e2de59c Compare July 16, 2026 23:25

@xezon xezon left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking very promising.

Comment thread Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt Outdated
@xezon xezon added the Refactor Edits the code with insignificant behavior changes, is never user facing label Jul 17, 2026
@xezon xezon changed the title refactor(Game): Qualify WWVegas component header includes chore: Use qualified include paths for WWVegas headers (2) Jul 18, 2026
@xezon

xezon commented Jul 18, 2026

Copy link
Copy Markdown

Needs Rebase

@CryoTheRenegade
CryoTheRenegade force-pushed the refactor/wwvegas-game-headers-part2 branch from e2de59c to 61b9e87 Compare July 18, 2026 12:18
@CryoTheRenegade

CryoTheRenegade commented Jul 18, 2026

Copy link
Copy Markdown
Author

Rebased

@CryoTheRenegade
CryoTheRenegade force-pushed the refactor/wwvegas-game-headers-part2 branch from 61b9e87 to 4d3becb Compare July 18, 2026 14:52

@xezon xezon left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good effort

@xezon

xezon commented Jul 18, 2026

Copy link
Copy Markdown

There is a compile error in VC6 builds.

@CryoTheRenegade
CryoTheRenegade force-pushed the refactor/wwvegas-game-headers-part2 branch from 4d3becb to 18f3204 Compare July 18, 2026 15:49
Comment thread Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt Outdated
VERBATIM
)
add_library(core_browserenginewin STATIC BrowserEngine_i.c)
add_library(core_browserenginewin STATIC BrowserEngine_i.c BrowserEngine.h BrowserEngine.tlb)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes sense I think.

OUTPUT BrowserEngine_i.c BrowserEngine.h
COMMAND midl.exe "${CMAKE_CURRENT_LIST_DIR}\\BrowserEngine.idl" /header BrowserEngine.h /iid BrowserEngine_i.c
OUTPUT BrowserEngine_i.c BrowserEngine.h BrowserEngine.tlb
COMMAND midl.exe "${CMAKE_CURRENT_LIST_DIR}\\BrowserEngine.idl" /header BrowserEngine.h /iid BrowserEngine_i.c /tlb BrowserEngine.tlb

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you elaborate why this edit is required or recommended?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MIDL already makes this file by default. Naming it here puts the file on CMake’s checklist, so it can remake it if it goes missing. It is not required for this compile alone, but it makes future clean builds safer.

Comment thread Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp
@CryoTheRenegade
CryoTheRenegade force-pushed the refactor/wwvegas-game-headers-part2 branch from 18f3204 to dce47e5 Compare July 19, 2026 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Refactor Edits the code with insignificant behavior changes, is never user facing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

WWVegas headers are not correctly included always

2 participants