Updated for latest SDK.
diff --git a/expat/amiga/Makefile b/expat/amiga/Makefile
index d4681a1..8450dd5 100644
--- a/expat/amiga/Makefile
+++ b/expat/amiga/Makefile
@@ -37,15 +37,15 @@
help:
@echo "Requires:"
@echo " AmigaOS 4.0"
- @echo " SDK 51.15"
- @echo " clib2 1.198"
+ @echo " SDK 51.22"
+ @echo " clib2 1.202"
@echo ""
@echo "Targets:"
@echo " all - make expat libraries, xmlwf, examples and run test suite"
@echo " install - install expat libraries and tools into SDK"
all:
- -makedir lib libs
+ -makedir force lib libs
$(MAKE) staticlib
$(MAKE) sharedlib
@@ -63,7 +63,7 @@
-delete libs/#?.o quiet
install:
- copy lib/xmlwf $(tooldir) quiet
+ copy libs/xmlwf $(tooldir) quiet
copy /lib/expat.h /lib/expat_external.h $(staticincludedir) quiet
copy lib/libexpat.a $(staticlibdir) quiet
copy libs/expat.library $(sharedlibdir) quiet
@@ -82,12 +82,15 @@
LAUNCH =
ifeq ($(MAKECMDGOALS), staticlib)
+ CFLAGS += -mcrt=clib2
+ LDFLAGS += -mcrt=clib2
LIBS += $(STATICLIB)
INCLUDES = -I../lib
endif
ifeq ($(MAKECMDGOALS), sharedlib)
- CFLAGS += -DAMIGA_SHARED_LIB -D__USE_INLINE__
+ CFLAGS += -mcrt=newlib -D__USE_INLINE__
+ LDFLAGS += -mcrt=newlib
INCLUDES = -I. -Iinclude -Iinclude/libraries -I../lib
LAUNCH = $(DESTDIR)/launch.o
endif
diff --git a/expat/amiga/README.txt b/expat/amiga/README.txt
index d63f870..149518f 100644
--- a/expat/amiga/README.txt
+++ b/expat/amiga/README.txt
@@ -14,6 +14,13 @@
HISTORY
=======
+4.2 - updated to correspond to Expat 2.0.1 release
+ - bumped copyright banners and versions
+ - simplified amigaconfig.h
+ - updated include/libraries/expat.h file
+ - modified launch.c to use contructor/deconstructor
+ - removed need for amiga_main() from expat utilities
+
4.1 - fixed memory freeing bug in shared library version
- now allocates shared memory
