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.

Sign up for GitHub

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 SGDK tag, update to 1.34 #39

Merged
merged 4 commits into from
Oct 28, 2018
Merged

Use SGDK tag, update to 1.34 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d23d0c
Use SGDK tag, update to 1.34
kubilus1 Oct 21, 2018
afe03a1
Build changes
kubilus1 Oct 25, 2018
7123e10
Only do release stage on tag.
kubilus1 Oct 27, 2018
ab8b710
Only build master branch
kubilus1 Oct 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
dist: trusty
language: c
sudo: false
branches:
only:
- master
addons:
apt:
packages:
Expand Down Expand Up @@ -42,9 +45,10 @@ jobs:
- make sgdk_clean sgdk_build
- make sgdk_samples
- stage: release to github
if: tag IS present
script:
- echo "Deploying to github..."
- make release
- VER=$TRAVIS_TAG make release
deploy:
provider: releases
api_key: "$GITHUB_OAUTH_TOKEN"
Expand Down
12 changes: 11 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BUILDDIR?=$(CURDIR)/build
GENDEV?=/opt/gendev/
TOPDIR=$(CURDIR)

VER=0.3.0
VER?=dev

PATH := $(BUILDDIR)/bin:$(PATH)

Expand All @@ -21,6 +21,16 @@ build: toolchain_build tools_build sgdk_build
$(BUILDDIR):
mkdir -p $@

stepbystep:
make clean
make toolchain_clean
cd toolchain && make setup
cd toolchain && make build-binutils
cd toolchain && make build-gcc-1
cd toolchain && make build-newlib
cd toolchain && make build-gcc-2
cd toolchain && make build-ldscripts

toolchain_build:
cd toolchain && make toolchain_build

Expand Down
6 changes: 3 additions & 3 deletions gen_gcc/makefile-gen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# build-m68k-newlib: build-m68k-newlib-only

# User configuration
MAKE?=make
MAKE?=CFLAGS=-static make
sh_target=sh-elf
m68k_target=m68k-elf
sh_prefix?=/opt/toolchains/gen/$(sh_target)
Expand Down Expand Up @@ -73,7 +73,7 @@ $(build_sh2_targets): target = $(sh_target)
$(build_sh2_targets): extra_configure_args = --with-endian=big --with-cpu=m2 --disable-werror
$(build_m68k_targets): prefix = $(m68k_prefix)
$(build_m68k_targets): target = $(m68k_target)
$(build_m68k_targets): extra_configure_args = --with-cpu=m68000 --disable-werror
$(build_m68k_targets): extra_configure_args = --with-cpu=m68000 --disable-werror --disable-nls --disable-multilib

# To avoid code repetition, we use the same commands for both
# architectures. But we can't create a single target called
Expand Down Expand Up @@ -125,7 +125,7 @@ $(build_gcc_pass2): logdir
> $(log)
cd $(build); ../$(src_dir)/configure --target=$(target) --prefix=$(prefix) --with-newlib --disable-libssp --disable-tls \
--enable-threads=$(thread_model) --enable-languages=$(pass2_languages) $(extra_configure_args) $(to_log)
$(MAKE) -C $(build) all install DESTDIR=$(DESTDIR) $(to_log)
$(MAKE) -j8 -C $(build) all install DESTDIR=$(DESTDIR) $(to_log)
$(clean_up)

# ---- }}}}
Expand Down
7 changes: 5 additions & 2 deletions sgdk/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GENGCC_BIN=$(GENDEV)/bin
SGDKDIR=$(CURDIR)/SGDK
SAMPLESDIR=$(SGDKDIR)/sample

SGDKVER=1_3
SGDKVER=1.34
SGDKINSTALLDIR=$(GENDEV)/sgdk$(SGDKVER)


Expand Down Expand Up @@ -34,7 +34,9 @@ prep:
cd $(SGDKDIR) && patch -u -p1 < ../files/sgdk.diff

$(SGDKDIR):
git clone https://github.com/Stephane-D/SGDK.git
git clone -b '$(SGDKVER)' --single-branch --depth 1 https://github.com/Stephane-D/SGDK.git
#git clone https://github.com/Stephane-D/SGDK.git
#cd $(SGDKDIR) && $ git checkout tags/$(SGDKVER)
cd $(SGDKDIR) && patch -u -p1 < ../files/sgdk.diff
#cp files/makefile.vars $(SGDKDIR)/.
#git clone https://github.com/kubilus1/SGDK.git $(SGDKDIR)
Expand All @@ -46,6 +48,7 @@ $(SGDKDIR)/libmd.a: $(SGDKDIR)

$(SGDKINSTALLDIR):
mkdir -p $@
rm -f $(GENDEV)/sgdk
cd $(GENDEV) && ln -sf sgdk$(SGDKVER) sgdk

install: tools $(SGDKDIR)/libmd.a $(SGDKINSTALLDIR)
Expand Down