-
Notifications
You must be signed in to change notification settings - Fork 18
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
Bring makefiles in line with each other #111
Bring makefiles in line with each other #111
Conversation
5fb0d62
to
7e1e5b9
Compare
7e1e5b9
to
4d43cdd
Compare
@walkero-gr I'd like it if we can merge this in before my other PRs, even if it means I'll have to clean up some conflicts after for them. |
4d43cdd
to
5745462
Compare
Use OS4 as the extension on targets and variables instead of AOS4. This lines up better with the other extensions (which are all three characters).
These should be built for PowerPC, not for 68k.
We shouldn't rely on hard-coded paths in the makefiles. Require that the header files we need can be found via environment variables set before calling make. We'll use this opportunity to also set up the correct include paths for building for OS 4 with gcc.
Tidy up the release target and avoid requiring that each individual build of iGame itself passes (e.g. situations where we can't build for MOS or OS4). Provide a new target to clean up the day's release package as well. BREAKING CHANGE: Users will need to build each specific executable that they want in a release package before using the `release` target in the makefile.
Reduce the number of differences between the different makefiles in hope that we can eventually reduce down to a makefile for AmigaOS, a makefile for VBCC builds on other platforms, and a makefile for GCC builds on other platforms.
Set the RELEASE_DATE define even for non-Docker builds.
5745462
to
8a5142f
Compare
@walkero-gr merge conflicts with fix-catalogs-not-loading / master resolved. |
@coldacid Is this PR still valid? If yes, can you please check my comments above? If no, should I close it? |
@walkero-gr it's still valid, but I'm not seeing earlier comments from you on this PR. They might have been eaten by one of the rebase-force-pushes earlier. |
# Set up version and date properties | ||
########################################################################## | ||
|
||
DATE = $(shell date --iso=date) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure about this. Does it work under AmigaOS?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This worked for AmigaOS 4.1 with the SDK installed, but I believe that's because the GNU date utility took priority in the path in that instance. You're right that it probably won't work normally, especially as AmigaOS has its own date utility.
@coldacid Please, inform me if you see now my comments. |
Since the morphos and aosppc platform targets for vbcc already state the c99 flag, these aren't actually required in the CFLAGS defines for those platforms.
@walkero-gr yep, I see them now. |
Related to #92, this brings all the makefiles more or less in line with each other. Most of the differences between the makefiles have been removed, and most of what remains are platform or compiler specific.