diff --git a/.project b/.project new file mode 100755 index 0000000..9174df7 --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + amiga-gcc + + + + + + + + diff --git a/Makefile b/Makefile index 70b1935..1a62a7a 100644 --- a/Makefile +++ b/Makefile @@ -69,8 +69,9 @@ all: gcc binutils fd2sfd fd2pragma ira sfdc vbcc vasm vlink libnix ixemul libgcc # ================================================= # clean # ================================================= -.PHONY: clean-prefix clean clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-libgcc clean-clib2 clean-libdebug clean-libSDL12 clean-newlib -clean: clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-clib2 clean-libdebug clean-libSDL12 clean-newlib +.PHONY: clean-prefix clean clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-libgcc clean-clib2 clean-libdebug clean-libSDL12 clean-newlib clean-ndk +clean: clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-clib2 clean-libdebug clean-libSDL12 clean-newlib clean-ndk + rm -rf build clean-gcc: rm -rf build/gcc @@ -103,6 +104,9 @@ clean-vbcc: clean-vlink: rm -rf build/vlink +clean-ndk: + rm -rf build/ndk-include + clean-libnix: rm -rf build/libnix @@ -208,7 +212,7 @@ gcc: build/gcc/_done build/gcc/_done: build/gcc/Makefile $(shell find 2>/dev/null $(GCCD) -maxdepth 1 -type f ) build/binutils/_done cd build/gcc && $(MAKE) all-gcc cd build/gcc && $(MAKE) install-gcc - echo "done" >build/gcc/_done + echo "done" >$@ @echo "built $(GCC)" build/gcc/Makefile: projects/gcc/configure projects/ixemul/configure build/binutils/_done @@ -239,7 +243,7 @@ build/binutils/_done: build/binutils/Makefile $(shell find 2>/dev/null projects/ touch -d19710101 projects/binutils/ld/ldgram.y cd build/binutils && $(MAKE) all-gas all-binutils all-ld cd build/binutils && $(MAKE) install-gas install-binutils install-ld - echo "done" >build/binutils/_done + echo "done" >$@ echo "build $(BINUTILS)" build/binutils/Makefile: projects/binutils/configure @@ -424,16 +428,20 @@ projects/vlink/Makefile: NDK_INCLUDE = $(shell find 2>/dev/null projects/NDK_3.9/Include/include_h -type f) NDK_INCLUDE_SFD = $(shell find 2>/dev/null projects/NDK_3.9/Include/sfd -type f -name *.sfd) -SYS_INCLUDE_INLINE = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/inline/%.h,$(NDK_INCLUDE_SFD)) -SYS_INCLUDE_LVO = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/lvo/%_lib.i,$(NDK_INCLUDE_SFD)) -SYS_INCLUDE_PROTO = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/proto/%.h,$(NDK_INCLUDE_SFD)) -SYS_INCLUDE2 = $(filter-out $(SYS_INCLUDE_PROTO),$(patsubst projects/NDK_3.9/Include/include_h/%,$(PREFIX)/m68k-amigaos/ndk-include/%, $(NDK_INCLUDE))) +NDK_INCLUDE_INLINE = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/inline/%.h,$(NDK_INCLUDE_SFD)) +NDK_INCLUDE_LVO = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/lvo/%_lib.i,$(NDK_INCLUDE_SFD)) +NDK_INCLUDE_PROTO = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/proto/%.h,$(NDK_INCLUDE_SFD)) +SYS_INCLUDE2 = $(filter-out $(NDK_INCLUDE_PROTO),$(patsubst projects/NDK_3.9/Include/include_h/%,$(PREFIX)/m68k-amigaos/ndk-include/%, $(NDK_INCLUDE))) .PHONY: ndk-include2 ndk-inline ndk-lvo ndk-proto ndk-include2: build/ndk-include/_ndk -build/ndk-include/_ndk: projects/NDK_3.9.info $(NDK_INCLUDE) $(SYS_INCLUDE_INLINE) $(SYS_INCLUDE_LVO) $(SYS_INCLUDE_PROTO) projects/fd2sfd/configure projects/fd2pragma/makefile +build/ndk-include/_ndk: build/ndk-include/_ndk0 $(NDK_INCLUDE_INLINE) $(NDK_INCLUDE_LVO) $(NDK_INCLUDE_PROTO) projects/fd2sfd/configure projects/fd2pragma/makefile + mkdir -p build/ndk-include/ + echo "done" >$@ + +build/ndk-include/_ndk0: projects/NDK_3.9.info $(NDK_INCLUDE) mkdir -p $(PREFIX)/m68k-amigaos/ndk-include rsync -a $(PWD)/projects/NDK_3.9/Include/include_h/* $(PREFIX)/m68k-amigaos/ndk-include --exclude proto rsync -a $(PWD)/projects/NDK_3.9/Include/include_i/* $(PREFIX)/m68k-amigaos/ndk-include @@ -451,16 +459,16 @@ build/ndk-include/_ndk: projects/NDK_3.9.info $(NDK_INCLUDE) $(SYS_INCLUDE_INLIN mkdir -p build/ndk-include/ echo "done" >$@ -ndk-inline: $(SYS_INCLUDE_INLINE) sfdc build/ndk-include/_inline -$(SYS_INCLUDE_INLINE): $(PREFIX)/bin/sfdc $(NDK_INCLUDE_SFD) build/ndk-include/_inline build/ndk-include/_lvo build/ndk-include/_proto +ndk-inline: $(NDK_INCLUDE_INLINE) sfdc build/ndk-include/_inline +$(NDK_INCLUDE_INLINE): $(PREFIX)/bin/sfdc $(NDK_INCLUDE_SFD) build/ndk-include/_inline build/ndk-include/_lvo build/ndk-include/_proto build/ndk-include/_ndk0 sfdc --target=m68k-amigaos --mode=macros --output=$@ $(patsubst $(PREFIX)/m68k-amigaos/ndk-include/inline/%.h,projects/NDK_3.9/Include/sfd/%_lib.sfd,$@) -ndk-lvo: $(SYS_INCLUDE_LVO) sfdc -$(SYS_INCLUDE_LVO): $(PREFIX)/bin/sfdc $(NDK_INCLUDE_SFD) build/ndk-include/_lvo +ndk-lvo: $(NDK_INCLUDE_LVO) sfdc +$(NDK_INCLUDE_LVO): $(PREFIX)/bin/sfdc $(NDK_INCLUDE_SFD) build/ndk-include/_lvo build/ndk-include/_ndk0 sfdc --target=m68k-amigaos --mode=lvo --output=$@ $(patsubst $(PREFIX)/m68k-amigaos/ndk-include/lvo/%_lib.i,projects/NDK_3.9/Include/sfd/%_lib.sfd,$@) -ndk-proto: $(SYS_INCLUDE_PROTO) sfdc -$(SYS_INCLUDE_PROTO): $(PREFIX)/bin/sfdc $(NDK_INCLUDE_SFD) build/ndk-include/_proto +ndk-proto: $(NDK_INCLUDE_PROTO) sfdc +$(NDK_INCLUDE_PROTO): $(PREFIX)/bin/sfdc $(NDK_INCLUDE_SFD) build/ndk-include/_proto build/ndk-include/_ndk0 sfdc --target=m68k-amigaos --mode=proto --output=$@ $(patsubst $(PREFIX)/m68k-amigaos/ndk-include/proto/%.h,projects/NDK_3.9/Include/sfd/%_lib.sfd,$@) build/ndk-include/_inline: @@ -505,8 +513,10 @@ ndk13: build/ndk-include/_ndk while read p; do mkdir -p $(PREFIX)/m68k-amigaos/ndk13-include/$$(dirname $$p); cp $(PREFIX)/m68k-amigaos/ndk-include/$$p $(PREFIX)/m68k-amigaos/ndk13-include/$$p; done < patches/ndk13/hfiles while read p; do \ mkdir -p $(PREFIX)/m68k-amigaos/ndk13-include/$$(dirname $$p); \ + if grep V36 $(PREFIX)/m68k-amigaos/ndk-include/$$p; then \ sed -n -e '/#ifndef CLIB/,/V36/p' $(PREFIX)/m68k-amigaos/ndk-include/$$p >$(PREFIX)/m68k-amigaos/ndk13-include/$$p; \ echo -e "#ifdef __cplusplus\n}\n#endif /* __cplusplus */\n#endif" >>$(PREFIX)/m68k-amigaos/ndk13-include/$$p; \ + else cp $(PREFIX)/m68k-amigaos/ndk-include/$$p $(PREFIX)/m68k-amigaos/ndk13-include/$$p; fi \ done < patches/ndk13/chfiles while read p; do mkdir -p $(PREFIX)/m68k-amigaos/ndk13-include/$$(dirname $$p); echo "" >$(PREFIX)/m68k-amigaos/ndk13-include/$$p; done < patches/ndk13/ehfiles echo '#undef EXECNAME' > $(PREFIX)/m68k-amigaos/ndk13-include/exec/execname.h @@ -519,37 +529,22 @@ ndk13: build/ndk-include/_ndk sfdc --target=m68k-amigaos --mode=macros --output=$(PREFIX)/m68k-amigaos/ndk13-include/inline/$$(basename $$i _lib.sfd).h $$i; \ sfdc --target=m68k-amigaos --mode=proto --output=$(PREFIX)/m68k-amigaos/ndk13-include/proto/$$(basename $$i _lib.sfd).h $$i; \ done - + # ================================================= -# ixemul +# netinclude # ================================================= -CONFIG_IXEMUL = --prefix=$(PREFIX) --target=m68k-amigaos --host=m68k-amigaos --disable-cat - -IXEMUL_INCLUDE = $(shell find 2>/dev/null projects/ixemul/include -type f) -SYS_INCLUDE = $(patsubst projects/ixemul/include/%,$(PREFIX)/m68k-amigaos/ixemul/include/%, $(IXEMUL_INCLUDE)) - -build/ixemul/Makefile: build/libnix/_done projects/ixemul/configure $(shell find 2>/dev/null projects/ixemul -not \( -path projects/ixemul/.git -prune \) -type f) - mkdir -p build/ixemul - cd build/ixemul && $(A) $(PWD)/projects/ixemul/configure $(CONFIG_IXEMUL) - -.PHONY: ixemul-include -ixemul-include: build/ixemul-include/_done - -build/ixemul-include/_done: $(IXEMUL_INCLUDE) projects/ixemul/configure - mkdir -p $(PREFIX)/m68k-amigaos/ixemul/include - rsync -a projects/ixemul/include/* $(PREFIX)/m68k-amigaos/ixemul/include - mkdir -p build/ixemul-include/ +build/_netinclude: projects/amiga-netinclude/README.md build/ndk-include/_ndk $(shell find 2>/dev/null projects/amiga-netinclude/include -type f) + mkdir -p $(PREFIX)/m68k-amigaos/ndk-include + rsync -a $(PWD)/projects/amiga-netinclude/include/* $(PREFIX)/m68k-amigaos/ndk-include echo "done" >$@ -projects/ixemul/configure: +projects/amiga-netinclude/README.md: @mkdir -p projects - cd projects && git clone -b master --depth 4 https://github.com/bebbo/ixemul - + cd projects && git clone -b master --depth 4 https://github.com/bebbo/amiga-netinclude # ================================================= # libnix # ================================================= - CONFIG_LIBNIX = --prefix=$(PREFIX)/m68k-amigaos/libnix --target=m68k-amigaos --host=m68k-amigaos LIBNIX_SRC = $(shell find 2>/dev/null projects/libnix -not \( -path projects/libnix/.git -prune \) -not \( -path projects/libnix/sources/stubs/libbases -prune \) -not \( -path projects/libnix/sources/stubs/libnames -prune \) -type f) @@ -559,19 +554,15 @@ libnix: build/libnix/_done build/libnix/_done: build/libnix/Makefile cd build/libnix && $(MAKE) cd build/libnix && $(MAKE) install - @echo "done" >build/libnix/_done + @echo "done" >$@ @echo "built $(LIBNIX)" -build/libnix/Makefile: build/ixemul-include/_done build/ndk-include/_ndk build/binutils/_done build/gcc/_done projects/libnix/configure projects/libnix/Makefile.in $(LIBNIX_SRC) - mkdir -p $(PREFIX)/m68k-amigaos/libnix/lib/libnix +build/libnix/Makefile: build/newlib/_done build/ndk-include/_ndk build/_netinclude build/binutils/_done build/gcc/_done projects/libnix/configure projects/libnix/Makefile.in $(LIBNIX_SRC) + mkdir -p $(PREFIX)/m68k-amigaos/libnix/lib/libnix mkdir -p build/libnix echo 'void foo(){}' > build/libnix/x.c - if [ ! -e $(PREFIX)/m68k-amigaos/libnix/lib/libnix/ncrt0.o ]; then $(PREFIX)/bin/m68k-amigaos-gcc -c build/libnix/x.c -o $(PREFIX)/m68k-amigaos/libnix/lib/libnix/ncrt0.o; fi - if [ ! -e $(PREFIX)/m68k-amigaos/libnix/lib/libnix/libm.a ]; then $(PREFIX)/bin/m68k-amigaos-ar r $(PREFIX)/m68k-amigaos/libnix/lib/libnix/libm.a; fi - if [ ! -e $(PREFIX)/m68k-amigaos/libnix/lib/libnix/libnixmain.a ]; then $(PREFIX)/bin/m68k-amigaos-ar r $(PREFIX)/m68k-amigaos/libnix/lib/libnix/libnixmain.a; fi - if [ ! -e $(PREFIX)/m68k-amigaos/libnix/lib/libnix/libnix.a ]; then $(PREFIX)/bin/m68k-amigaos-ar r $(PREFIX)/m68k-amigaos/libnix/lib/libnix/libnix.a; fi - if [ ! -e $(PREFIX)/m68k-amigaos/libnix/lib/libnix/libnix20.a ]; then $(PREFIX)/bin/m68k-amigaos-ar r $(PREFIX)/m68k-amigaos/libnix/lib/libnix/libnix20.a; fi - if [ ! -e $(PREFIX)/m68k-amigaos/libnix/lib/libnix/libstubs.a ]; then $(PREFIX)/bin/m68k-amigaos-ar r $(PREFIX)/m68k-amigaos/libnix/lib/libnix/libstubs.a; fi + if [ ! -e $(PREFIX)/m68k-amigaos/lib/libstubs.a ]; then $(PREFIX)/bin/m68k-amigaos-ar r $(PREFIX)/m68k-amigaos/lib/libstubs.a; fi + if [ ! -e $(PREFIX)/m68k-amigaos/lib/libamiga.a ]; then $(PREFIX)/bin/m68k-amigaos-ar r $(PREFIX)/m68k-amigaos/lib/libamiga.a; fi mkdir -p $(PREFIX)/lib/gcc/m68k-amigaos/$(GCC_VERSION) if [ ! -e $(PREFIX)/lib/gcc/m68k-amigaos/$(GCC_VERSION)/libgcc.a ]; then $(PREFIX)/bin/m68k-amigaos-ar r $(PREFIX)/lib/gcc/m68k-amigaos/$(GCC_VERSION)/libgcc.a; fi cd build/libnix && CFLAGS="$(TARGET_C_FLAGS)" AR=m68k-amigaos-ar AS=m68k-amigaos-as CC=m68k-amigaos-gcc $(A) $(PWD)/projects/libnix/configure $(CONFIG_LIBNIX) @@ -606,7 +597,7 @@ libgcc: build/gcc/_libgcc_done build/gcc/_libgcc_done: build/libnix/_done $(LIBAMIGA) cd build/gcc && $(MAKE) all-target cd build/gcc && $(MAKE) install-target - echo "done" >build/gcc/_libgcc_done + echo "done" >$@ echo "$(LIBGCCS)" # ================================================= @@ -622,7 +613,7 @@ build/clib2/_done: projects/clib2/LICENSE $(shell find 2>/dev/null projects/clib mkdir -p $(PREFIX)/m68k-amigaos/clib2 rsync -a build/clib2/include $(PREFIX)/m68k-amigaos/clib2 rsync -a build/clib2/lib $(PREFIX)/m68k-amigaos/clib2 - echo "done" >build/clib2/_done + echo "done" >$@ projects/clib2/LICENSE: @mkdir -p projects @@ -638,7 +629,7 @@ libdebug: build/libdebug/_done build/libdebug/_done: build/libdebug/Makefile cd build/libdebug && $(MAKE) cp build/libdebug/libdebug.a $(PREFIX)/m68k-amigaos/lib/ - echo "done" >build/libdebug/_done + echo "done" >$@ build/libdebug/Makefile: build/libnix/_done projects/libdebug/configure $(shell find 2>/dev/null projects/libdebug -not \( -path projects/libdebug/.git -prune \) -type f) mkdir -p build/libdebug @@ -666,7 +657,7 @@ build/libSDL12/_done: build/libSDL12/Makefile.bax rsync -a build/libSDL12/include/GL/*.i $(PREFIX)/include/GL/ rsync -a build/libSDL12/include/GL/*.h $(PREFIX)/include/GL/ rsync -a build/libSDL12/include/SDL/*.h $(PREFIX)/include/SDL/ - echo "done" >build/libSDL12/_done + echo "done" >$@ build/libSDL12/Makefile.bax: build/libnix/_done projects/libSDL12/Makefile.bax $(shell find 2>/dev/null projects/libSDL12 -not \( -path projects/libSDL12/.git -prune \) -type f) mkdir -p build/libSDL12 @@ -682,31 +673,26 @@ projects/libSDL12/Makefile.bax: # newlib # ================================================= NEWLIB_CONFIG = CC=m68k-amigaos-gcc -NEWLIB_FILES = $(shell find 2>/dev/null projects/newlib-cygwin -not \( -path projects/projects/newlib-cygwin/.git -prune \) -type f) +NEWLIB_FILES = $(shell find 2>/dev/null projects/newlib-cygwin/newlib -type f) .PHONY: newlib newlib: build/newlib/_done -build/newlib/_done: build/newlib/newlib/libc.a - echo "done" >build/newlib/_done +build/newlib/_done: build/newlib/newlib/libc.a + echo "done" >$@ -#build/newlib/libgloss/libgloss.a: build/newlib/libgloss/Makefile -# cd build/newlib/libgloss && $(MAKE) - -build/newlib/newlib/libc.a: build/newlib/newlib/Makefile +build/newlib/newlib/libc.a: build/newlib/newlib/Makefile $(NEWLIB_FILES) cd build/newlib/newlib && $(MAKE) + cd build/newlib/newlib && $(MAKE) install + touch $@ -build/newlib/newlib/Makefile: projects/newlib-cygwin/configure build/binutils/_done build/gcc/_done $(NEWLIB_FILES) +build/newlib/newlib/Makefile: projects/newlib-cygwin/configure build/binutils/_done build/gcc/_done mkdir -p build/newlib/newlib cd build/newlib/newlib && $(NEWLIB_CONFIG) CFLAGS="$(TARGET_C_FLAGS)" $(PWD)/projects/newlib-cygwin/newlib/configure --host=m68k-amigaos --prefix=$(PREFIX) -#build/newlib/libgloss/Makefile: projects/newlib-cygwin/configure build/binutils/_done build/gcc/_done $(NEWLIB_FILES) - # mkdir -p build/newlib/libgloss -# cd build/newlib/libgloss && $(NEWLIB_CONFIG) $(PWD)/projects/newlib-cygwin/newlib/configure --host=m68k-amigaos --prefix=$(PREFIX) - -projects/newlib-cygwin/configure: +projects/newlib-cygwin/newlib/configure: @mkdir -p projects - cd projects && git clone -b master --depth 4 https://github.com/bebbo/newlib-cygwin + cd projects && git clone -b amiga --depth 4 https://github.com/bebbo/newlib-cygwin # ================================================= # sdk installation @@ -727,6 +713,7 @@ $(SDKS): libnix # info # ================================================= info: + @echo $@ @echo PREFIX=$(PREFIX) @echo GCC_GIT=$(GCC_GIT) @echo GCC_BRANCH=$(GCC_BRANCH) @@ -735,4 +722,3 @@ info: @echo TARGET_C_FLAGS=$(TARGET_C_FLAGS) @echo BINUTILS_GIT=$(BINUTILS_GIT) @echo BINUTILS_BRANCH=$(BINUTILS_BRANCH) - diff --git a/patches/NDK_3.9/Include/include_h/devices/timer.h.diff b/patches/NDK_3.9/Include/include_h/devices/timer.h.diff index eb1c6bf..83c5a26 100644 --- a/patches/NDK_3.9/Include/include_h/devices/timer.h.diff +++ b/patches/NDK_3.9/Include/include_h/devices/timer.h.diff @@ -1,20 +1,11 @@ ---- NDK_3.9/Include/include_h/devices/timer.h Wed Aug 30 16:13:01 1995 -+++ NDK_3.9/Include/include_h/devices/timer.h Sat Aug 10 15:53:59 1996 -@@ -27,10 +27,17 @@ - - #define TIMERNAME "timer.device" - -+#ifndef _SYS_TIME_H_ -+/* Use whatever was included first, standard (sys/time.h) or Amiga -+ * includes (jch). */ - struct timeval { +--- /old/Include/include_h/devices/timer.h 2001-12-17 14:03:44.000000000 +0100 ++++ /new/Include/include_h/devices/timer.h 2018-05-07 09:55:38.850775200 +0200 +@@ -31,6 +31,8 @@ ULONG tv_secs; ULONG tv_micro; }; -+#else -+#define tv_secs tv_sec -+#define tv_micro tv_usec -+#endif ++#define tv_sec tv_secs ++#define tv_usec tv_micro struct EClockVal { ULONG ev_hi; diff --git a/patches/NDK_3.9/Include/include_h/intuition/classes.h.diff b/patches/NDK_3.9/Include/include_h/intuition/classes.h.diff new file mode 100644 index 0000000..7c20264 --- /dev/null +++ b/patches/NDK_3.9/Include/include_h/intuition/classes.h.diff @@ -0,0 +1,30 @@ +--- /old/Include/include_h/intuition/classes.h 2001-12-17 14:16:30.000000000 +0100 ++++ /new/Include/include_h/intuition/classes.h 2018-05-09 20:00:44.813785900 +0200 +@@ -48,7 +48,12 @@ + ULONG cl_ObjectCount; /* Number of objects */ + ULONG cl_Flags; + +-} Class; ++} ++#ifdef __OBJC__ ++ IntuitionClass; ++#else ++ Class; ++#endif + + #define CLF_INLIST 0x00000001L + /* class is in public class list */ +@@ -106,7 +111,12 @@ + { + struct Library cl_Lib; /* Embedded library */ + UWORD cl_Pad; /* Align the structure */ +- Class *cl_Class; /* Class pointer */ ++#ifdef __OBJC__ ++ IntuitionClass ++#else ++ Class ++#endif ++ *cl_Class; /* Class pointer */ + + }; + diff --git a/patches/ndk13/chfiles b/patches/ndk13/chfiles new file mode 100755 index 0000000..6fe3253 --- /dev/null +++ b/patches/ndk13/chfiles @@ -0,0 +1,19 @@ +clib/alib_protos.h +clib/console_protos.h +clib/diskfont_protos.h +clib/dos_protos.h +clib/exec_protos.h +clib/expansion_protos.h +clib/graphics_protos.h +clib/icon_protos.h +clib/intuition_protos.h +clib/layers_protos.h +clib/mathffp_protos.h +clib/mathieeesingbas_protos.h +clib/mathieeesingtrans_protos.h +clib/mathieeedoubbas_protos.h +clib/mathieeedoubtrans_protos.h +clib/mathtrans_protos.h +clib/potgo_protos.h +clib/timer_protos.h +clib/translator_protos.h diff --git a/patches/ndk13/ehfiles b/patches/ndk13/ehfiles new file mode 100755 index 0000000..e416d0a --- /dev/null +++ b/patches/ndk13/ehfiles @@ -0,0 +1,18 @@ +exec/avl.h +intuition/classes.h +intuition/iobsolete.h +intuition/cghook.h +intuition/classusr.h +graphics/displayinfo.h +graphics/monitor.h +libraries/commodities.h +dos/record.h +dos/rdargs.h +dos/dosasl.h +dos/var.h +dos/notify.h +rexx/storage.h +utility/hooks.h +utility/tagitem.h +proto/commodities.h +datatypes/pictureclass.h diff --git a/patches/ndk13/fdfiles b/patches/ndk13/fdfiles new file mode 100644 index 0000000..19913b1 --- /dev/null +++ b/patches/ndk13/fdfiles @@ -0,0 +1,18 @@ +console_lib.fd +diskfont_lib.fd +dos_lib.fd +exec_lib.fd +expansion_lib.fd +graphics_lib.fd +icon_lib.fd +intuition_lib.fd +layers_lib.fd +mathffp_lib.fd +mathieeesingbas_lib.fd +mathieeesingtrans_lib.fd +mathieeedoubbas_lib.fd +mathieeedoubtrans_lib.fd +mathtrans_lib.fd +potgo_lib.fd +timer_lib.fd +translator_lib.fd diff --git a/patches/ndk13/hfiles b/patches/ndk13/hfiles new file mode 100644 index 0000000..bffc57f --- /dev/null +++ b/patches/ndk13/hfiles @@ -0,0 +1,92 @@ +dos/datetime.h +dos/dos.h +dos/dosextens.h +dos/doshunks.h +dos/exall.h +dos/filehandler.h +devices/audio.h +devices/bootblock.h +devices/clipboard.h +devices/console.h +devices/conunit.h +devices/gameport.h +devices/hardblocks.h +devices/input.h +devices/inputevent.h +devices/keyboard.h +devices/keymap.h +devices/narrator.h +devices/parallel.h +devices/printer.h +devices/prtbase.h +devices/prtgfx.h +devices/scsidisk.h +devices/serial.h +devices/timer.h +devices/trackdisk.h +exec/alerts.h +exec/devices.h +exec/errors.h +exec/exec.h +exec/execbase.h +exec/interrupts.h +exec/io.h +exec/libraries.h +exec/lists.h +exec/memory.h +exec/nodes.h +exec/ports.h +exec/resident.h +exec/semaphores.h +exec/tasks.h +exec/types.h +graphics/clip.h +graphics/collide.h +graphics/copper.h +graphics/display.h +graphics/gels.h +graphics/gfx.h +graphics/gfxbase.h +graphics/gfxmacros.h +graphics/gfxnodes.h +graphics/graphint.h +graphics/layers.h +graphics/rastport.h +graphics/regions.h +graphics/sprite.h +graphics/text.h +graphics/view.h +hardware/adkbits.h +hardware/blit.h +hardware/cia.h +hardware/custom.h +hardware/dmabits.h +hardware/intbits.h +intuition/intuition.h +intuition/intuitionbase.h +intuition/preferences.h +intuition/screens.h +libraries/configregs.h +libraries/configvars.h +libraries/diskfont.h +libraries/dos.h +libraries/dosextens.h +libraries/expansion.h +libraries/expansionbase.h +libraries/filehandler.h +libraries/mathffp.h +libraries/mathieeedp.h +libraries/mathlibrary.h +libraries/translator.h +resources/cia.h +resources/disk.h +resources/filesysres.h +resources/mathresource.h +resources/misc.h +resources/potgo.h +workbench/icon.h +workbench/startup.h +workbench/workbench.h +proto/alib.h +inline/stubs.h +inline/macros.h diff --git a/sdk/amitcp.sdk b/sdk/amitcp.sdk deleted file mode 100644 index 8b66730..0000000 --- a/sdk/amitcp.sdk +++ /dev/null @@ -1,63 +0,0 @@ -Short: API for TCP/IP stack as shared library -Author: amitcp-group@hut.fi (The AmiTCP/IP Group) -Uploader: amitcp-group hut fi -Type: comm/net -Version: 2.2 -Architecture: m68k-amigaos - -Url: http://aminet.net/comm/tcp/AmiTCP-api-22.lha - -AmiTCP-2.2/netinclude/arpa/inet.h -AmiTCP-2.2/netinclude/bsdsocket.h -AmiTCP-2.2/netinclude/charread.h -AmiTCP-2.2/netinclude/clib/ -AmiTCP-2.2/netinclude/clib/socket_inlines.h -AmiTCP-2.2/netinclude/clib/socket_protos.h -AmiTCP-2.2/netinclude/devices/ -AmiTCP-2.2/netinclude/devices/sana2.h -AmiTCP-2.2/netinclude/devices/sana2.i -AmiTCP-2.2/netinclude/devices/sana2specialstats.h -AmiTCP-2.2/netinclude/devices/sana2specialstats.i -AmiTCP-2.2/netinclude/errno.h -AmiTCP-2.2/netinclude/fd/ -AmiTCP-2.2/netinclude/fd/socket_lib.fd -AmiTCP-2.2/netinclude/grp.h -AmiTCP-2.2/netinclude/inetd.h -AmiTCP-2.2/netinclude/inetdlib.h -AmiTCP-2.2/netinclude/inline/ -AmiTCP-2.2/netinclude/inline/socket.h -AmiTCP-2.2/netinclude/lineread.h -AmiTCP-2.2/netinclude/net/ -AmiTCP-2.2/netinclude/net/if.h -AmiTCP-2.2/netinclude/net/if_arp.h -AmiTCP-2.2/netinclude/net/route.h -AmiTCP-2.2/netinclude/net/sana2errno.h -AmiTCP-2.2/netinclude/net/sana2tags.h -AmiTCP-2.2/netinclude/netdb.h -AmiTCP-2.2/netinclude/netinet/ -AmiTCP-2.2/netinclude/netinet/in.h -AmiTCP-2.2/netinclude/netinet/in_systm.h -AmiTCP-2.2/netinclude/netinet/ip.h -AmiTCP-2.2/netinclude/netinet/ip_icmp.h -AmiTCP-2.2/netinclude/netinet/ip_var.h -AmiTCP-2.2/netinclude/netinet/tcp.h -AmiTCP-2.2/netinclude/netinet/udp.h -AmiTCP-2.2/netinclude/pragmas/ -AmiTCP-2.2/netinclude/pragmas/socket_pragmas.h -AmiTCP-2.2/netinclude/proto/ -AmiTCP-2.2/netinclude/proto/socket.h -AmiTCP-2.2/netinclude/protocols/ -AmiTCP-2.2/netinclude/protocols/dumprestore.h -AmiTCP-2.2/netinclude/protocols/routed.h -AmiTCP-2.2/netinclude/protocols/rwhod.h -AmiTCP-2.2/netinclude/protocols/talkd.h -AmiTCP-2.2/netinclude/protocols/timed.h -AmiTCP-2.2/netinclude/pwd.h -AmiTCP-2.2/netinclude/sys/ -AmiTCP-2.2/netinclude/sys/errno.h -AmiTCP-2.2/netinclude/sys/ioctl.h -AmiTCP-2.2/netinclude/sys/param.h -AmiTCP-2.2/netinclude/sys/socket.h -AmiTCP-2.2/netinclude/sys/syslog.h -AmiTCP-2.2/netinclude/sys/time.h -AmiTCP-2.2/netinclude/sys/types.h diff --git a/sdk/install b/sdk/install index 6f8fe12..4ca8c6e 100755 --- a/sdk/install +++ b/sdk/install @@ -77,14 +77,11 @@ case $1 in ( flock -x 200 - $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libnix/libstubs.a build/$2/$name.o || exit 1 - $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libm020/libnix/libstubs.a build/$2/$name.o || exit 1 - $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libm020/libm881/libnix/libstubs.a build/$2/$name.o || exit 1 - $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libb32/libm020/libnix/libstubs.a build/$2/$name.o || exit 1 - $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libb32/libm020/libm881/libnix/libstubs.a build/$2/$name.o || exit 1 - $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libb/libnix/libstubs.a build/$2/$name.o || exit 1 - $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libb/libm020/libnix/libstubs.a build/$2/$name.o || exit 1 - $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libb/libm020/libm881/libnix/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/lib/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/lib/libb/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/lib/libm020/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/lib/libm020/libb/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/lib/libm020/libb32/libstubs.a build/$2/$name.o || exit 1 ) 200>/tmp/amiga-gcc-libstubs-lock ;; lib)