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

Bring makefiles in line with each other #111

Merged
merged 10 commits into from
Nov 30, 2020

Conversation

coldacid
Copy link
Contributor

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.

@walkero-gr walkero-gr added this to the iGame v2.1 milestone Sep 22, 2020
@coldacid coldacid force-pushed the cleaner-make-and-release branch from 5fb0d62 to 7e1e5b9 Compare September 25, 2020 01:06
@coldacid coldacid force-pushed the cleaner-make-and-release branch from 7e1e5b9 to 4d43cdd Compare October 19, 2020 16:17
@coldacid
Copy link
Contributor Author

@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.

@coldacid coldacid force-pushed the cleaner-make-and-release branch from 4d43cdd to 5745462 Compare October 23, 2020 03:19
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.
@coldacid coldacid force-pushed the cleaner-make-and-release branch from 5745462 to 8a5142f Compare October 28, 2020 16:04
@coldacid
Copy link
Contributor Author

@walkero-gr merge conflicts with fix-catalogs-not-loading / master resolved.

@walkero-gr
Copy link
Collaborator

@coldacid Is this PR still valid? If yes, can you please check my comments above? If no, should I close it?

@coldacid
Copy link
Contributor Author

coldacid commented Nov 9, 2020

@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.

Makefile.docker Outdated Show resolved Hide resolved
Makefile.linux Show resolved Hide resolved
# Set up version and date properties
##########################################################################

DATE = $(shell date --iso=date)
Copy link
Collaborator

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?

Copy link
Contributor Author

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.

@walkero-gr
Copy link
Collaborator

@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.
@coldacid
Copy link
Contributor Author

@walkero-gr yep, I see them now.

@walkero-gr walkero-gr merged commit 2e64402 into MrZammler:master Nov 30, 2020
@coldacid coldacid deleted the cleaner-make-and-release branch November 30, 2020 18:09
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.

2 participants