diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2019-03-25 19:10:11 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2019-03-25 19:10:11 +0000 |
| commit | 2b2fc4177cdc4feef6c46cbd0e710b49ccfc4791 (patch) | |
| tree | a9e43a87a2fc31006c484be64b585b4b7c821136 | |
| parent | 5aa16e27177fbaffb9955abe48bd2917d0253828 (diff) | |
| download | toolchains-2b2fc4177cdc4feef6c46cbd0e710b49ccfc4791.tar.gz toolchains-2b2fc4177cdc4feef6c46cbd0e710b49ccfc4791.tar.bz2 | |
Move Roadshow SDK into the SDK part of the toolchain where the include path can be determined more easily
| -rw-r--r-- | m68k-unknown-amigaos/Makefile | 11 | ||||
| -rw-r--r-- | sdk/Makefile | 15 |
2 files changed, 15 insertions, 11 deletions
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index d26af6b..6dd0d2a 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -32,9 +32,6 @@ UPSTREAM_CLIB2_URI := https://github.com/adtools/clib2/archive/$(UPSTREAM_CLIB2_ UPSTREAM_NDK_TARBALL := ndk-3.9-includes.tar.bz2 UPSTREAM_NDK_URI := http://kas1e.mikendezign.com/zerohero_crosscompilers_backup/files/m68k-amigaos/ndk-3.9-includes.tar.bz2 -UPSTREAM_ROADSHOWSDK_TARBALL := Roadshow-SDK-NS.lha -UPSTREAM_ROADSHOWSDK_URI := https://github.com/chris-y/curl/releases/download/curl-7_64_0-amissl/$(UPSTREAM_ROADSHOWSDK_TARBALL) - UPSTREAM_OPENURL_VERSION := 7.16 UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION) UPSTREAM_OPENURL_URI := https://github.com/jens-maus/libopenurl/archive/$(UPSTREAM_OPENURL_VERSION).tar.gz @@ -127,7 +124,7 @@ $(BUILDSTEPS)/clib2-src.d: $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL) # Rules to install the NDK ### -$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL) +$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) mkdir -p $(PREFIX)/$(TARGET_NAME) tar -C $(PREFIX)/$(TARGET_NAME) --strip-components=2 -xjf $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) for p in `ls $(RECIPES)/patches/ndk/*.p` ; do patch -d $(PREFIX)/$(TARGET_NAME) -p0 <$$p ; done @@ -149,9 +146,6 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR lha xw=$(BUILDDIR)/AmiSSL $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/include/* $(PREFIX)/$(TARGET_NAME)/sys-include/ cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/lib/AmigaOS3/* $(PREFIX)/$(TARGET_NAME)/lib/ - mkdir -p $(BUILDDIR)/Roadshow-SDK - lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL) - cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(PREFIX)/$(TARGET_NAME)/netinclude/ touch $@ ### @@ -262,9 +256,6 @@ $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL): $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL): wget -q -O $@ $(UPSTREAM_NDK_URI) -$(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL): - wget -q -O $@ $(UPSTREAM_ROADSHOWSDK_URI) - $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL): wget -q -O $@ $(UPSTREAM_OPENURL_URI) diff --git a/sdk/Makefile b/sdk/Makefile index 82940b7..8c8c93d 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -125,7 +125,7 @@ ifeq ($(TARGET),i686-w64-mingw32) endif ifeq ($(TARGET),m68k-unknown-amigaos) - SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d) EXTRAARGS_LIBCARES := --disable-shared --without-random EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver --with-amissl --with-zlib --disable-rt LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024" @@ -302,6 +302,19 @@ $(BUILDSTEPS)/freetype-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/freetype-$( $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2: $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FREETYPE).tar.bz2" $@ +# amiga roadshow sdk +$(BUILDSTEPS)/roadshow.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/roadshow-src.d + mkdir -p $(BUILDDIR)/Roadshow-SDK + lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCEDIR)/Roadshow-SDK-NS.lha + cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(GCCSDK_INSTALL_ENV)/netinclude/ + touch $@ + +$(BUILDSTEPS)/roadshow-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/Roadshow-SDK-NS.lha + touch $@ + +$(SOURCEDIR)/Roadshow-SDK-NS.lha: + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://github.com/chris-y/curl/releases/download/curl-7_64_0-amissl/Roadshow-SDK-NS.lha" $@ + # regex $(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d mkdir -p $(BUILDDIR)/libtre |