Skip to content

Conversation

jmalak
Copy link
Contributor

@jmalak jmalak commented Dec 23, 2024

fix recursive call to make for MSVC and Open Watcom

do make files more consistent

  • add NULLCMD macro
  • add WARNFILESX macro as template for extensions substitution
  • use EMPTY macro everywhere
  • use RM_F and RM_RF everywhere for deletion

@hpax
Copy link
Member

hpax commented Oct 3, 2025

As of 3.00rc19, the code seems to work, but I will look at this for 3.01 to see if it can be done better.

@Yongjie2017
Copy link
Collaborator

Team was busy on getting 3.00 release ready. And the msvc building system got a huge improvement.
Please rebase the code and see whether broken one is fixed already or not! If not, could you please re-do the patch based on the latest code base?

@jmalak jmalak force-pushed the fix-3 branch 22 times, most recently from a88744a to ee34545 Compare October 4, 2025 18:33
@hpax
Copy link
Member

hpax commented Oct 4, 2025

Hi, this seems to fail the tests you have added :)

Also, I don't know much about github CI/CD, but if you could please check to see if conflicts with the one added on the nasm-3.00.xx branch (which is the correct branch for this.)

If wmake needs %make, then $(MAKE) should be set appropriately, instead of making it a wmake-specific rule.

As many of the rules should be put into the generated sections (#-- --#) so that they are explicitly kept in sync. Since it looks like you are re-introducing the warnings rules for the auxiliary Makefiles it does have potential issues.

I also wonder if it would be better to make OpenWatcom work with GNU make/owcc (owcc was broken last time I tried it) and ideally configure instead of WMAKE. Alternatively, config/watcom.h almost certainly needs updating...

@hpax
Copy link
Member

hpax commented Oct 4, 2025

FYI - I'm going to be disaggregating the warnings from the source code. It "seemed like a good idea" but has turned out to be a nightmare from a dependency point of view.

@jmalak jmalak force-pushed the fix-3 branch 3 times, most recently from 98b6058 to 8ae1b63 Compare October 4, 2025 19:30
@jmalak jmalak force-pushed the fix-3 branch 24 times, most recently from b4e2188 to 1f1f553 Compare October 5, 2025 09:07
@jmalak
Copy link
Contributor Author

jmalak commented Oct 5, 2025

No problem, I can do it for you if you have a new version then send me note and I will check and fix if needed.
I finished build testing for MS Visual Studio 2022 and Open Watcom 1.9/2.0 and Linux/Windows host build.
I will create two new PRs and close this one, because most of issues are already fixed, but there are a few new issues.
One for code changes and second one for make files.

@jmalak
Copy link
Contributor Author

jmalak commented Oct 6, 2025

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants