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

Fixes for windows.mk openssl makefile CLEN-2403 #200

Merged
merged 19 commits into from
Dec 25, 2024
Merged

Fixes for windows.mk openssl makefile CLEN-2403 #200

merged 19 commits into from
Dec 25, 2024

Conversation

stephenlb
Copy link
Member

@stephenlb stephenlb commented Nov 27, 2024

feat(custom-flags): added the way to set additional compiler flags

Additional flags for C/CPP can be set with: USER_C_FLAGS / USER_CXX_FLAGS

fix(Makefile): fix missed pbbase64.c

Fix because of which one of the source files has been missed for Windows.

fix(Makefile): fix Makefile macro for Windows

Fix issue with unsupported concatenation of sources files / definitions (+=).

refactor(makefiles): refactor Makefiles

Refactor our Makefiles from different folders and platforms to use include directives to include shared definitions, flags, source files.

@stephenlb stephenlb changed the title Add base64 to windows.mk Add pbbase64 to windows.mk default objects to build Nov 27, 2024
@stephenlb stephenlb changed the title Add pbbase64 to windows.mk default objects to build Add pbbase64 to windows.mk default build objects Nov 27, 2024
The `+=` operator in windows.mk makefiles seems to cause issues.
@stephenlb stephenlb changed the title Add pbbase64 to windows.mk default build objects Fixes for windows.mk openssl makefile Nov 27, 2024
@stephenlb stephenlb changed the title Fixes for windows.mk openssl makefile Fixes for windows.mk openssl makefile CLEN-2403 Nov 27, 2024
Copy link
Contributor

@parfeon parfeon left a comment

Choose a reason for hiding this comment

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

LGTM!

@parfeon
Copy link
Contributor

parfeon commented Dec 10, 2024

Additional flags for C/CPP can be set with: USER_C_FLAGS /USER_CXX_FLAGS

@parfeon
Copy link
Contributor

parfeon commented Dec 10, 2024

@stephenlb I need to change PR description, so I'm keeping your original message here:

Update windows.mk makefile in openssl builds.

  • Adds $(APP_CFLAGS) to CFLAGS
  • Adds ..\lib\base64\pbbase64.c to windows.mk makefile
  • Removes += operators, which are not always supported windows.mk makefile

Jira Ticket: https://pubnub.atlassian.net/browse/CLEN-2403

@stephenlb
Copy link
Member Author

Sounds good!

@parfeon parfeon self-assigned this Dec 10, 2024
@parfeon parfeon added status: done This issue is considered resolved. priority: high This PR should be reviewed ASAP. type: fix This PR contains fixes to existing features. labels Dec 10, 2024
Use callback preprocessing macros.

refactor: remove redundant libs

Remove redundant libraries import from subscribe event engine.
KGronek-Pubnub and others added 4 commits December 10, 2024 17:32
`nmake` not as flexible as `make` and has set of limitations which needs to be handled.
Fix paths to the custom OpenSSL location.
@parfeon
Copy link
Contributor

parfeon commented Dec 25, 2024

@pubnub-release-bot release

@parfeon parfeon merged commit ea0a4c1 into master Dec 25, 2024
5 checks passed
@parfeon parfeon deleted the CLEN-2403 branch December 25, 2024 23:38
@pubnub-release-bot
Copy link
Contributor

🚀 Release successfully completed 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority: high This PR should be reviewed ASAP. status: done This issue is considered resolved. type: fix This PR contains fixes to existing features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants