Skip to content
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

Unify the Emscripten and non-Emscripten builds #9417

Merged
merged 7 commits into from
Jan 8, 2025

Conversation

oleg-derevenetz
Copy link
Collaborator

@oleg-derevenetz oleg-derevenetz commented Jan 6, 2025

  • The Emscripten build and the general build differ from each other in only one thing - in the name of the target file (fheroes2.js vs fheroes2). There is no need to have a separate Makefile in a separate directory just for Emscripten.
  • rm -f works just fine in the Makefile clean targets, but the canonical way for GNU Make to ignore potential errors is to use the - prefix for the "potentially failing" commands.

@oleg-derevenetz oleg-derevenetz added improvement New feature, request or improvement WASM WASM version of the engine labels Jan 6, 2025
@oleg-derevenetz oleg-derevenetz added this to the 1.1.6 milestone Jan 6, 2025
@oleg-derevenetz oleg-derevenetz marked this pull request as ready for review January 6, 2025 13:59
@oleg-derevenetz oleg-derevenetz requested a review from ihhub January 6, 2025 13:59
@oleg-derevenetz oleg-derevenetz marked this pull request as draft January 6, 2025 14:08
@oleg-derevenetz oleg-derevenetz removed the request for review from ihhub January 6, 2025 14:08
Makefile.vita Show resolved Hide resolved
@oleg-derevenetz oleg-derevenetz force-pushed the emscripten-build-unification branch from 7cc3fc1 to 1f28bdc Compare January 6, 2025 18:18
@oleg-derevenetz oleg-derevenetz marked this pull request as ready for review January 6, 2025 19:08
@oleg-derevenetz oleg-derevenetz requested a review from ihhub January 6, 2025 19:08
@ihhub ihhub merged commit 0cf0b4d into ihhub:master Jan 8, 2025
40 checks passed
@ihhub
Copy link
Owner

ihhub commented Jan 8, 2025

@oleg-derevenetz , thank you so much for these changes!

@oleg-derevenetz oleg-derevenetz deleted the emscripten-build-unification branch January 8, 2025 04:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement New feature, request or improvement WASM WASM version of the engine
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants