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

use $(PRET) tools install #813

Closed
wants to merge 10 commits into from
Closed

use $(PRET) tools install #813

wants to merge 10 commits into from

Conversation

nicholatian
Copy link

Also use clang on macOS, because gcc can be really wonky with homebrew sometimes.

The main feature is the migration of tools out of the local directory they’re installed in and into a folder /opt/pret/. This makes it easy to move the tools around or use different versions for diagnostics. It also allows people to download precompiled binaries of the tools, which I have made available on the Cave of Origin for Linux and macOS using the grups tool.

I’m open to seeing the tools moved to the pret GitHub organisation, and this is how agbcc is already handled, but for now they exist under the Fanhacker’s Toolkit because it’s an org I have control over. I have tested this with a clean repo using make -j$(nproc) && make compare and get an OK, using the tools downloaded from the Cave using the install-all.sh convenience script provided by grups. Let me know how it handles for you.

@PikalaxALT
Copy link
Collaborator

Please update the include path for compilation with agbcc, to use the pret headers instead of the devkitPro headers.

ifneq ($(OS),Windows_NT)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
HOSTCC := /usr/bin/clang
Copy link
Collaborator

Choose a reason for hiding this comment

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

No. Just no.

Copy link
Author

Choose a reason for hiding this comment

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

uh, yes. the gcc command is ambiguous asf on macOS. we should stick to the system compiler unless otherwise specified

@@ -75,49 +102,33 @@ endif

CPPFLAGS := -iquote include -Wno-trigraphs -DMODERN=$(MODERN)
ifeq ($(MODERN),0)
CPPFLAGS += -I tools/agbcc/include -I tools/agbcc
CPPFLAGS += -I $(PRET)/include -I $(PRET)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Add -nostdinc -undef here

# -*- coding: utf-8 -*-
## Convenience script for installing all the tools at once

REPO='https://pkg.caveoforig.in/fhtk/';
Copy link
Collaborator

Choose a reason for hiding this comment

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

Would be better to have the repo point back to pret on github, or to some host maintained by pret keyholders.

_sudo='';
fi

_cwd="${PWD}";
Copy link
Collaborator

Choose a reason for hiding this comment

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

use pushd and popd instead

Copy link
Author

Choose a reason for hiding this comment

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

thanks i forgot about those

@PikalaxALT PikalaxALT closed this Nov 29, 2019
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