Skip to content

[CMAKE][CORE] Move WWLib and WWDebug to Core #663

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.

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
merged 1 commit into from
Apr 14, 2025

Conversation

feliwir
Copy link

@feliwir feliwir commented Apr 12, 2025

This change moves the wwlib and wwdebug libraries to Core. The source files were previously properly unified between Generals and Zero Hour.

Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Copilot reviewed 302 out of 307 changed files in this pull request and generated no comments.

Files not reviewed (5)
  • Core/CMakeLists.txt: Language not supported
  • Core/Libraries/CMakeLists.txt: Language not supported
  • Core/Libraries/Source/WWVegas/CMakeLists.txt: Language not supported
  • Core/Libraries/Source/WWVegas/WWDebug/CMakeLists.txt: Language not supported
  • Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt: Language not supported
Comments suppressed due to low confidence (1)

Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h:112

  • [nitpick] Consider using a more formal comment style and removing developer-specific tags for clarity; a descriptive comment explaining the rationale for choosing the ZH path would be more suitable for production code.
// TheSuperHackers: @compile feliwir 12/04/2025: Both Debug headers are identical. Use ZH.

@feliwir feliwir requested review from tomsons26 and xezon April 12, 2025 15:25
Copy link

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Before merging this, we need to properly sync left over files in WWlib from Zero Hour to Generals:

mempool.h
trim.cpp
widestring.cpp
widestring.h
wwstring.cpp
wwstring.h

And the various files in WWDebug.

This change as is hides the differences between the games.

@xezon xezon added this to the Code foundation build up milestone Apr 12, 2025
@xezon xezon added Minor Severity: Minor < Major < Critical < Blocker Gen Relates to Generals ZH Relates to Zero Hour Unify Unifies code between Generals and Zero Hour labels Apr 12, 2025
@feliwir feliwir force-pushed the dedup-wwlib branch 2 times, most recently from 529bd0e to 694c846 Compare April 14, 2025 14:18
@xezon
Copy link

xezon commented Apr 14, 2025

I cannot push to this branch.

"git" push --recurse-submodules=check --progress "feliwir" refs/heads/dedup-wwlib:refs/heads/dedup-wwlib
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
ERROR: Permission to feliwir/CnC_Generals_Zero_Hour.git denied to xezon.
Done

  • FastAllocator files need to be deleted.
  • Comment needs to be formatted to // TheSuperHackers @compile feliwir 12/04/2025 Both Debug headers are identical. Use ZH.
  • files list in WWDEBUG_SRC needs to be sorted

@feliwir feliwir force-pushed the dedup-wwlib branch 2 times, most recently from 2d5f58d to 0f252f6 Compare April 14, 2025 20:06
@feliwir feliwir requested a review from xezon April 14, 2025 20:21
@xezon
Copy link

xezon commented Apr 14, 2025

Why does this change suddenly show a diff on 383 files?

@feliwir
Copy link
Author

feliwir commented Apr 14, 2025

Why does this change suddenly show a diff on 383 files?

How many files should it be?

Copy link

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Looks good.

@feliwir feliwir merged commit ccf4584 into TheSuperHackers:main Apr 14, 2025
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Gen Relates to Generals Minor Severity: Minor < Major < Critical < Blocker Unify Unifies code between Generals and Zero Hour ZH Relates to Zero Hour
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants