Changes In Branch amiga-library Through [5cda5efedc] Excluding Merge-Ins
This is equivalent to a diff from e5a154ef2a to 5cda5efedc
|
2020-06-04
| ||
| 23:01 | Add initial amiga-{library,glue,end}.m check-in: f6ab72da6e user: js tags: amiga-library | |
| 22:37 | extra.mk.in: Remove obsolete comment check-in: 85288221c8 user: js tags: trunk | |
| 22:34 | Initial work to build ObjFW as Amiga .library check-in: 5cda5efedc user: js tags: amiga-library | |
| 22:28 | Update buildsys check-in: e5a154ef2a user: js tags: trunk | |
|
2020-06-02
| ||
| 21:35 | Merge support for setting mtime (and atime) check-in: b57531df38 user: js tags: trunk | |
Modified configure.ac from [643b664c35] to [a06396f052].
| ︙ | |||
51 52 53 54 55 56 57 58 59 60 61 62 63 64 | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | + | LDFLAGS="$LDFLAGS -noixemul" enable_files="yes" # Required for reading ENV: enable_shared="no" supports_amiga_lib="yes" AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(OBJFW_AMIGA_LIB, objfw68k.library) AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt68k.library) AC_SUBST(SFDC_TARGET, m68k-amigaos) AC_SUBST(SFD_FILE, amigaos3.sfd) AC_SUBST(SFDC_INLINE_H, inline.h) dnl For 68000, GCC emits calls to helper functions that dnl do not work properly in a library. t="-mcpu=68020 -fbaserel -noixemul" |
| ︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | + | OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS -noixemul" LDFLAGS="$LDFLAGS -noixemul" enable_files="yes" # Required for reading ENV: supports_amiga_lib="yes" check_pedantic="no" # Breaks generated inlines AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(OBJFW_AMIGA_LIB, objfw.library) AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt.library) AC_SUBST(CVINCLUDE_INLINE_H, inline.h) t="-mresident32 -ffreestanding -noixemul" AC_SUBST(AMIGA_LIB_CFLAGS, $t) t="-mresident32 -nostartfiles -nodefaultlibs" t="$t -noixemul -lc" AC_SUBST(AMIGA_LIB_LDFLAGS, $t) |
| ︙ | |||
375 376 377 378 379 380 381 382 383 384 385 386 387 388 | 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 | + + + + |
TESTS_LIBS="-framework ObjFW \${RUNTIME_FRAMEWORK_LIBS} $TESTS_LIBS"
TESTS_LIBS="-F../src -F../src/runtime $TESTS_LIBS"
], [
TESTS_LIBS="\${RUNTIME_LIBS} $TESTS_LIBS"
TESTS_LIBS="-L../src/runtime -L../src/runtime/linklib $TESTS_LIBS"
TESTS_LIBS="-L../src -lobjfw $TESTS_LIBS"
])
AS_IF([test x"$enable_amiga_lib" != x"no"], [
AC_SUBST(LINKLIB, linklib)
])
AC_ARG_ENABLE(amiga-lib,
AS_HELP_STRING([--disable-amiga-lib], [do not build Amiga library]))
AS_IF([test x"$supports_amiga_lib" != x"yes"], [enable_amiga_lib="no"])
AS_IF([test x"$enable_shared" = x"no" -a x"$enable_amiga_lib" = x"no"], [
enable_static="yes"
|
| ︙ | |||
529 530 531 532 533 534 535 | 535 536 537 538 539 540 541 542 543 544 545 546 547 548 | - | AS_IF([test x"$build_framework" = x"yes"], [ AC_SUBST(OBJFWRT_FRAMEWORK, "ObjFWRT.framework") AC_SUBST(RUNTIME_FRAMEWORK_LIBS, "-framework ObjFWRT") ]) AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(RUNTIME_LIBS, "-lobjfwrt.library") |
| ︙ |
Modified extra.mk.in from [13c419ce36] to [36c9a17469].
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 | + |
OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@
OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@
OBJFW_FRAMEWORK = @OBJFW_FRAMEWORK@
OBJFW_AMIGA_LIB = @OBJFW_AMIGA_LIB@
# When changing: Be sure to also change these in the Xcode project!
OBJFW_LIB_MAJOR = 9
OBJFW_LIB_MINOR = 1
OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR}
OBJFWRT_SHARED_LIB = @OBJFWRT_SHARED_LIB@
OBJFWRT_STATIC_LIB = @OBJFWRT_STATIC_LIB@
|
| ︙ |
Modified src/Makefile from [fef35a3bdb] to [c74f4c5232].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | + |
include ../extra.mk
SUBDIRS = ${RUNTIME} exceptions ${ENCODINGS} forwarding invocation
SUBDIRS_AFTER = ${BRIDGE}
DISTCLEAN = objfw-defs.h
SHARED_LIB = ${OBJFW_SHARED_LIB}
STATIC_LIB = ${OBJFW_STATIC_LIB}
FRAMEWORK = ${OBJFW_FRAMEWORK}
AMIGA_LIB = ${OBJFW_AMIGA_LIB}
LIB_MAJOR = ${OBJFW_LIB_MAJOR}
LIB_MINOR = ${OBJFW_LIB_MINOR}
SRCS = OFASN1BitString.m \
OFASN1Boolean.m \
OFASN1Enumerated.m \
OFASN1IA5String.m \
|
| ︙ |