Skip to content

[CORE][GEN] Sync WWAudio with Zero Hour, move w3dview files to Core and prepare w3dview target for Generals #709

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 4 commits into from
Apr 27, 2025

Conversation

xezon
Copy link

@xezon xezon commented Apr 18, 2025

Merge with Rebase

This change replicates the following to get WWAudio of Generals in sync with Zero Hour.

It then moves all w3dview files to Core and creates a library interface that allows both Generals and Zero Hour to build a version of it.

The Generals w3dview build is disabled, because it has left over compile errors from WW3D2.

It can be enabled by commenting out # add_subdirectory(W3DView).

@xezon xezon added Minor Severity: Minor < Major < Critical < Blocker Build Anything related to building, compiling Generals Related Generals only Unify Unifies code between Generals and Zero Hour labels Apr 18, 2025
@xezon xezon requested a review from tomsons26 April 18, 2025 19:41
@xezon xezon force-pushed the xezon/generals-w3dview branch from e9e8406 to c8782b2 Compare April 18, 2025 19:56
@xezon xezon requested a review from feliwir April 18, 2025 19:56
@xezon xezon added this to the Code foundation build up milestone Apr 18, 2025
@xezon xezon force-pushed the xezon/generals-w3dview branch 2 times, most recently from be189fd to de03b16 Compare April 20, 2025 17:48
Copy link

@Mauller Mauller 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 to me, replicates all of the prior changes as mentioned and branch builds both variants of W3DView.

Only issue is that W3Dview will crash under debug for the generals variant and not continue if you ignore the assert, it just immediately closes.

The zero hour variant will continue and load the application if the assert is ignored.

The release variants for both run fine though.

@xezon xezon force-pushed the xezon/generals-w3dview branch from de03b16 to 37869ec Compare April 27, 2025 08:52
@Mauller
Copy link

Mauller commented Apr 27, 2025

Works fine after the recent push and sorting out my local VCPKG setup for use with Cmake GUI.

@xezon xezon removed the Minor Severity: Minor < Major < Critical < Blocker label Apr 27, 2025
@xezon xezon force-pushed the xezon/generals-w3dview branch from 37869ec to 82876a2 Compare April 27, 2025 14:18
@xezon
Copy link
Author

xezon commented Apr 27, 2025

Removed the unnecessary comments from w3dview CMakeLists.txt

@xezon xezon merged commit bc7afb8 into TheSuperHackers:main Apr 27, 2025
18 checks passed
xezon added a commit that referenced this pull request Apr 27, 2025
@xezon xezon deleted the xezon/generals-w3dview branch April 27, 2025 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build Anything related to building, compiling Generals Related Generals only Unify Unifies code between Generals and Zero Hour
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants