From d4eecae47356293c8f281453e2246dc32526adcf Mon Sep 17 00:00:00 2001 From: Bebbo Date: Fri, 9 Feb 2018 00:27:13 +0100 Subject: [PATCH] adding libSDL12 --- Makefile | 25 +++++++++++++++++++++++++ patches/vc.config | 14 ++++++++++++++ sdk/cgx.sdk | 1 + sdk/install | 5 +++++ 4 files changed, 45 insertions(+) create mode 100644 patches/vc.config diff --git a/Makefile b/Makefile index df01bdd..f5f1257 100644 --- a/Makefile +++ b/Makefile @@ -331,6 +331,10 @@ build/vasm/_done: build/vasm/Makefile $(shell find 2>/dev/null projects/vasm -no mkdir -p $(PREFIX)/bin/ install build/vasm/vasmm68k_mot $(PREFIX)/bin/ install build/vasm/vobjdump $(PREFIX)/bin/ + cp patches/vc.config build/vasm/vc.config + sed -e 's/\PREFIX/$(subst /,\/,$(PREFIX))/' -i build/vasm/vc.config + mkdir -p $(PREFIX)/m68k-amigaos/etc/ + install build/vasm/vc.config $(PREFIX)/m68k-amigaos/etc/ @echo "done" >$@ @echo "built $(vasm)" @@ -602,6 +606,27 @@ projects/libdebug/configure: @mkdir -p projects cd projects && git clone -b master --depth 4 https://github.com/bebbo/libdebug +# ================================================= +# libsdl +# ================================================= +CONFIG_LIBSDL12 = PREFX=$(PREFIX) PREF=$(PREFIX) + +libSDL12: build/libSDL12/_done + +build/libSDL12/_done: build/libSDL12/Makefile.bax + cd build/libSDL12 && $(MAKE) -f Makefile.bax $(CONFIG_LIBSDL12) + cp build/libSDL12/libsdl.a $(PREFIX)/m68k-amigaos/lib/ + echo "done" >build/libsdl/_done + +build/libSDL12/Makefile.bax: build/libnix/Makefile projects/libSDL12/Makefile.bax $(shell find 2>/dev/null projects/libSDL12 -not \( -path projects/libSDL12/.git -prune \) -type f) + mkdir -p build/libSDL12 + rsync -a projects/libSDL12/* build/libSDL12 + +projects/libSDL12/Makefile.bax: + @mkdir -p projects + cd projects && git clone -b master --depth 4 https://github.com/AmigaPorts/libSDL12 + + # ================================================= # sdk installation # ================================================= diff --git a/patches/vc.config b/patches/vc.config new file mode 100644 index 0000000..c6915e9 --- /dev/null +++ b/patches/vc.config @@ -0,0 +1,14 @@ +-cc=PREFIX/bin/vbccm68k -hunkdebug %s -o= %s %s -O=%ld -quiet -IPREFIX/m68k-amigaos/vbcc/include -IPREFIX/m68k-amigaos/sys-include +-ccv=PREFIX/bin/vbccm68k -hunkdebug %s -o= %s %s -O=%ld -IPREFIX/m68k-amigaos/vbcc/include -IPREFIX/m68k-amigaos/sys-include +-as=PREFIX/bin/vasmm68k_mot -Fhunk -phxass -opt-fconst -nowarn=62 -quiet -IPREFIX/m68k-amigaos/sys-include %s -o %s +-asv=PREFIX/bin/vasmm68k_mot -Fhunk -phxass -opt-fconst -nowarn=62 -IPREFIX/m68k-amigaos/sys-include %s -o %s +-rm=rm %s +-rmv=rm -v %s +-ld=PREFIX/bin/vlink -bamigahunk -x -Bstatic -Cvbcc -nostdlib PREFIX/m68k-amigaos/vbcc/lib/startup.o %s %s -LPREFIX/m68k-amigaos/vbcc/lib -LPREFIX/m68k-amigaos/vbcc/include -lvc -o %s +-l2=PREFIX/bin/vlink -bamigahunk -x -Bstatic -Cvbcc -nostdlib %s %s -LPREFIX/m68k-amigaos/vbcc/lib -LPREFIX/m68k-amigaos/vbcc/include -o %s +-ldv=PREFIX/bin/vlink -bamigahunk -t -x -Bstatic -Cvbcc -nostdlib PREFIX/m68k-amigaos/vbcc/lib/startup.o %s %s -LPREFIX/m68k-amigaos/vbcc/lib -LPREFIX/m68k-amigaos/vbcc/include -lvc -o %s +-l2v=PREFIX/bin/vlink -bamigahunk -t -x -Bstatic -Cvbcc -nostdlib %s %s -LPREFIX/m68k-amigaos/vbcc/lib -LPREFIX/m68k-amigaos/vbcc/include -o %s +-ldnodb=-s -Rshort +-ul=-l%s +-cf=-F%s +-ml=500 diff --git a/sdk/cgx.sdk b/sdk/cgx.sdk index 713035c..dfd3270 100644 --- a/sdk/cgx.sdk +++ b/sdk/cgx.sdk @@ -11,3 +11,4 @@ CGraphX/FD/cybergraphics_lib.fd = cybergraphics.fd fd2sfd : cybergraphics.fd clib/cybergraphics_protos.h sfdc : cybergraphics.sfd stubs : cybergraphics.sfd +symlink : include/cybergraphics include/cybergraphx diff --git a/sdk/install b/sdk/install index 437143b..259d3fb 100755 --- a/sdk/install +++ b/sdk/install @@ -95,6 +95,11 @@ case $1 in echo creating redirecting header $3/m68k-amigaos/include/${a[1]} echo "#include \"${a[2]}\"" >$3/m68k-amigaos/include/${a[1]} ;; + symlink) + echo creating symlink from ${a[2]} to ${a[1]} + rm -rf $3/${a[2]} + ln -s $3/${a[1]} $3/${a[2]} + ;; *) if [ "$line" != "" ]; then if [ "${a[1]}" == "=" ]; then