Overview
Comment: | runtime: Omit the linklib subdir on !AmigaOS
Even when no STATIC_LIB is specified (as is the case on !AmigaOS), |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
ddb1f5a3c5988e17bacca83c31131a87 |
User & Date: | js on 2018-05-05 18:14:05 |
Other Links: | manifest | tags |
Context
2018-05-05
| ||
18:20 | runtime: Re-add declarations for 2 glue functions check-in: 86863a8845 user: js tags: trunk | |
18:14 | runtime: Omit the linklib subdir on !AmigaOS check-in: ddb1f5a3c5 user: js tags: trunk | |
18:06 | runtime: Remove protos.h as it is no longer used check-in: f854e529c2 user: js tags: trunk | |
Changes
Modified configure.ac from [cb4bd9cd36] to [afe6666f22].
︙ | ︙ | |||
46 47 48 49 50 51 52 | [Minimum value for long long]) AC_DEFINE(__have_longlong64, 1, [Required for AmigaOS to correctly define PRI?64]) AC_SUBST(NOIXEMUL, -noixemul) AC_SUBST(OBJFW_RT_AMIGA_LIB, objfw_rt.library) | < > < > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | [Minimum value for long long]) AC_DEFINE(__have_longlong64, 1, [Required for AmigaOS to correctly define PRI?64]) AC_SUBST(NOIXEMUL, -noixemul) AC_SUBST(OBJFW_RT_AMIGA_LIB, objfw_rt.library) AC_SUBST(OBJFW_RT_INLINE_H, ObjFW_RT_inline.h) AC_SUBST(SFDC_TARGET, m68k-amigaos) AC_SUBST(LINKLIB, linklib) ;; powerpc-*-amigaos*) enable_shared="no" enable_threads="no" ;; *-morphos*) AS_IF([test x"$with_ixemul" != x"yes"], [ AS_IF([test x"$OBJCFLAGS" != x""], [ OBJCFLAGS="$OBJCFLAGS -noixemul" ], [ OBJCFLAGS="-O2 -g -noixemul" ]) LDFLAGS="$LDFLAGS -noixemul" enable_files="yes" # Required for reading ENV: AC_SUBST(NOIXEMUL, -noixemul) AC_SUBST(OBJFW_RT_AMIGA_LIB, objfw_rt.library) AC_SUBST(OBJFW_RT_INLINE_H, ObjFW_RT_inline.h) AC_SUBST(SFDC_TARGET, ppc-morphos) AC_SUBST(LINKLIB, linklib) ]) enable_shared="no" enable_threads="no" ;; *-msdosdjgpp*) enable_shared="no" |
︙ | ︙ |
Modified extra.mk.in from [7c45526c61] to [7cd4aa651a].
1 2 3 4 5 6 7 8 9 10 11 12 | OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@ OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@ OBJFW_FRAMEWORK = @OBJFW_FRAMEWORK@ # When changing: Be sure to also change these in the Xcode project! OBJFW_LIB_MAJOR = 9 OBJFW_LIB_MINOR = 0 OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR} OBJFW_RT_SHARED_LIB = @OBJFW_RT_SHARED_LIB@ OBJFW_RT_STATIC_LIB = @OBJFW_RT_STATIC_LIB@ OBJFW_RT_FRAMEWORK = @OBJFW_RT_FRAMEWORK@ OBJFW_RT_AMIGA_LIB = @OBJFW_RT_AMIGA_LIB@ | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@ OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@ OBJFW_FRAMEWORK = @OBJFW_FRAMEWORK@ # When changing: Be sure to also change these in the Xcode project! OBJFW_LIB_MAJOR = 9 OBJFW_LIB_MINOR = 0 OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR} OBJFW_RT_SHARED_LIB = @OBJFW_RT_SHARED_LIB@ OBJFW_RT_STATIC_LIB = @OBJFW_RT_STATIC_LIB@ OBJFW_RT_FRAMEWORK = @OBJFW_RT_FRAMEWORK@ OBJFW_RT_AMIGA_LIB = @OBJFW_RT_AMIGA_LIB@ OBJFW_RT_LIB_MAJOR = 0 OBJFW_RT_LIB_MINOR = 0 OBJFW_RT_LIB_MAJOR_MINOR = ${OBJFW_RT_LIB_MAJOR}.${OBJFW_RT_LIB_MINOR} OBJFW_BRIDGE_SHARED_LIB = @OBJFW_BRIDGE_SHARED_LIB@ OBJFW_BRIDGE_STATIC_LIB = @OBJFW_BRIDGE_STATIC_LIB@ OBJFW_BRIDGE_FRAMEWORK = @OBJFW_BRIDGE_FRAMEWORK@ |
︙ | ︙ | |||
42 43 44 45 46 47 48 49 50 51 52 53 54 55 | INVOCATION_INVOCATION_A = @INVOCATION_INVOCATION_A@ INVOCATION_INVOCATION_LIB_A = @INVOCATION_INVOCATION_LIB_A@ INVOCATION_LIB_A = @INVOCATION_LIB_A@ LIBOBJFW_DEP = @LIBOBJFW_DEP@ LIBOBJFW_DEP_LVL2 = @LIBOBJFW_DEP_LVL2@ LIBOBJFW_RT_DEP = @LIBOBJFW_RT_DEP@ LIBOBJFW_RT_DEP_LVL2 = @LIBOBJFW_RT_DEP_LVL2@ LOOKUP_ASM_A = @LOOKUP_ASM_A@ LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LIB_A@ LOOKUP_ASM_LOOKUP_ASM_A = @LOOKUP_ASM_LOOKUP_ASM_A@ LOOKUP_ASM_LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LOOKUP_ASM_LIB_A@ MAP_LDFLAGS = @MAP_LDFLAGS@ OBJFW_RT_INLINE_H = @OBJFW_RT_INLINE_H@ OFBLOCKTESTS_M = @OFBLOCKTESTS_M@ | > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | INVOCATION_INVOCATION_A = @INVOCATION_INVOCATION_A@ INVOCATION_INVOCATION_LIB_A = @INVOCATION_INVOCATION_LIB_A@ INVOCATION_LIB_A = @INVOCATION_LIB_A@ LIBOBJFW_DEP = @LIBOBJFW_DEP@ LIBOBJFW_DEP_LVL2 = @LIBOBJFW_DEP_LVL2@ LIBOBJFW_RT_DEP = @LIBOBJFW_RT_DEP@ LIBOBJFW_RT_DEP_LVL2 = @LIBOBJFW_RT_DEP_LVL2@ LINKLIB = @LINKLIB@ LOOKUP_ASM_A = @LOOKUP_ASM_A@ LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LIB_A@ LOOKUP_ASM_LOOKUP_ASM_A = @LOOKUP_ASM_LOOKUP_ASM_A@ LOOKUP_ASM_LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LOOKUP_ASM_LIB_A@ MAP_LDFLAGS = @MAP_LDFLAGS@ OBJFW_RT_INLINE_H = @OBJFW_RT_INLINE_H@ OFBLOCKTESTS_M = @OFBLOCKTESTS_M@ |
︙ | ︙ |
Modified src/runtime/Makefile from [a411b1ac5c] to [32b60048e1].
1 2 3 | include ../../extra.mk SUBDIRS = lookup-asm | | | 1 2 3 4 5 6 7 8 9 10 11 | include ../../extra.mk SUBDIRS = lookup-asm SUBDIRS_AFTER = ${LINKLIB} CLEAN = ${OBJFW_RT_INLINE_H} SHARED_LIB = ${OBJFW_RT_SHARED_LIB} STATIC_LIB = ${OBJFW_RT_STATIC_LIB} FRAMEWORK = ${OBJFW_RT_FRAMEWORK} AMIGA_LIB = ${OBJFW_RT_AMIGA_LIB} LIB_MAJOR = ${OBJFW_RT_LIB_MAJOR} |
︙ | ︙ |
Modified src/runtime/linklib/Makefile from [7d1dbba2ec] to [11a94e7953].
1 2 | include ../../../extra.mk | | | 1 2 3 4 5 6 7 8 9 | include ../../../extra.mk STATIC_LIB = libobjfw_rt.linklib.a SRCS = linklib.m include ../../../buildsys.mk CPPFLAGS += -DOBJC_COMPILING_AMIGA_LINKLIB -I.. -I../.. -I../../.. LD = ${OBJC} |