Comment: | Create separate Amiga libraries for OS3 & MorphOS
Otherwise, it would be necessary to make unwinding work between 68k and This also includes using separate .sfd files. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
1e70711672da3ed0136401c7bb4261cd |
User & Date: | js on 2019-05-05 19:28:25 |
Other Links: | manifest | tags |
2019-05-05
| ||
21:40 | configure: Don't use -pipe on MorphOS check-in: 2670c4637e user: js tags: trunk | |
19:28 | Create separate Amiga libraries for OS3 & MorphOS check-in: 1e70711672 user: js tags: trunk | |
2019-05-01
| ||
20:40 | .travis.yml: Re-enable Amiga as amiga-gcc is fixed check-in: 04de9d53bc user: js tags: trunk | |
Modified configure.ac from [c0e8992130] to [07a7d423c3].
1 2 3 4 5 6 7 8 9 10 11 12 13 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | - + | AC_INIT(ObjFW, 0.91-dev, js@heap.zone) AC_CONFIG_SRCDIR(src) AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_MACRO_DIR(build-aux/m4) AC_DEFINE(OBJFW_VERSION_MAJOR, 0, [The major version of ObjFW]) AC_DEFINE(OBJFW_VERSION_MINOR, 91, [The minor version of ObjFW]) dnl This may only be set to 0.91 once 0.91 is released AC_SUBST(BUNDLE_VERSION, 0.90.9900) AC_SUBST(BUNDLE_SHORT_VERSION, 0.90) for i in configure.ac build-aux/m4/*; do AS_IF([test $i -nt configure], [ |
︙ | |||
54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | + + + | enable_threads="no" enable_sockets="no" enable_files="yes" # Required for reading ENV: supports_amiga_lib="yes" ac_cv_snprintf_useful_ret="yes" AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(OBJFW_RT_AMIGA_LIB, 'objfw_rt_${OBJFW_RT_LIB_MAJOR}_68k.library') AC_SUBST(SFDC_TARGET, m68k-amigaos) AC_SUBST(SFD_FILE, amigaos3.sfd) dnl For 68000, GCC emits calls to helper functions that dnl do not work properly in a library. AC_SUBST(AMIGA_LIB_CFLAGS, "-mcpu=68020 -fbaserel") AC_SUBST(AMIGA_LIB_LDFLAGS, "-mcpu=68020 -fbaserel -resident -nostartfiles") ]) ;; |
︙ | |||
78 79 80 81 82 83 84 85 | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | + + + - - - - - + + + + + | OBJCFLAGS="$OBJCFLAGS -noixemul" OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS -noixemul" LDFLAGS="$LDFLAGS -noixemul" enable_files="yes" # Required for reading ENV: supports_amiga_lib="yes" AS_IF([test x"$enable_amiga_lib" != x"no"], [ t='objfw_rt_${OBJFW_RT_LIB_MAJOR}_abox.library' AC_SUBST(OBJFW_RT_AMIGA_LIB, $t) AC_SUBST(SFDC_TARGET, ppc-morphos) AC_SUBST(SFD_FILE, morphos.sfd) |
︙ | |||
508 509 510 511 512 513 514 | 514 515 516 517 518 519 520 521 522 523 524 525 526 527 | - | AS_IF([test x"$build_framework" = x"yes"], [ AC_SUBST(OBJFW_RT_FRAMEWORK, "ObjFW_RT.framework") AC_SUBST(RUNTIME_FRAMEWORK_LIBS, "-framework ObjFW_RT") ]) AS_IF([test x"$enable_amiga_lib" != x"no"], [ |
︙ |
Modified extra.mk.in from [a72b9c97f0] to [4fbf371cb1].
︙ | |||
66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | + | REEXPORT_RUNTIME = @REEXPORT_RUNTIME@ REEXPORT_RUNTIME_FRAMEWORK = @REEXPORT_RUNTIME_FRAMEWORK@ RUNTIME = @RUNTIME@ RUNTIME_FRAMEWORK_LIBS = @RUNTIME_FRAMEWORK_LIBS@ RUNTIME_LIBS = @RUNTIME_LIBS@ RUN_TESTS = @RUN_TESTS@ SFDC_TARGET = @SFDC_TARGET@ SFD_FILE = @SFD_FILE@ TESTPLUGIN = @TESTPLUGIN@ TESTPLUGIN_LIBS = @TESTPLUGIN_LIBS@ TESTS_LIBS = @TESTS_LIBS@ TESTS_STATIC_LIB = @TESTS_STATIC_LIB@ UNICODE_M = @UNICODE_M@ USE_INCLUDES_ATOMIC = @USE_INCLUDES_ATOMIC@ USE_SRCS_FILES = @USE_SRCS_FILES@ USE_SRCS_PLUGINS = @USE_SRCS_PLUGINS@ USE_SRCS_SOCKETS = @USE_SRCS_SOCKETS@ USE_SRCS_THREADS = @USE_SRCS_THREADS@ USE_SRCS_WINDOWS = @USE_SRCS_WINDOWS@ WRAPPER = @WRAPPER@ |
Modified generators/Makefile from [4bc126b447] to [74fa5c5d76].
1 2 3 4 5 6 7 8 9 10 11 12 13 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | - + | include ../extra.mk PROG_NOINST = gen_tables${PROG_SUFFIX} SRCS = TableGenerator.m .PHONY: run run: all rm -f libobjfw.so.${OBJFW_LIB_MAJOR} rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} rm -f libobjfw.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR} rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR} rm -f libobjfw_rt.dll libobjfw_rt.${OBJFW_RT_LIB_MAJOR}.dylib |
︙ | |||
38 39 40 41 42 43 44 | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | - - + + + | if test -f ../src/runtime/libobjfw_rt.dll; then \ ${LN_S} ../src/runtime/libobjfw_rt.dll libobjfw_rt.dll; \ fi if test -f ../src/runtime/libobjfw_rt.dylib; then \ ${LN_S} ../src/runtime/libobjfw_rt.dylib \ libobjfw_rt.${OBJFW_RT_LIB_MAJOR}.dylib; \ fi |
︙ |
Modified src/runtime/Makefile from [70c3ad8e0d] to [c6c73c6c03].
︙ | |||
41 42 43 44 45 46 47 | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | - + - + - - + + + | include ../../buildsys.mk ${OBJFW_RT_AMIGA_LIB}: inline.h amiga-library.m: amiga-library-functable.inc |
Deleted src/runtime/ObjFW_RT.sfd version [ae80bac89b].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Modified src/runtime/amiga-library.m from [c8fedb16aa] to [1262807e23].
︙ | |||
597 598 599 600 601 602 603 | 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 | - + | #ifdef OF_MORPHOS | RTF_PPC | RTF_EXTENDED #endif , .rt_Version = OBJFW_RT_LIB_MAJOR, .rt_Type = NT_LIBRARY, .rt_Pri = 0, |
︙ |
Added src/runtime/amigaos3.sfd version [5d6ee07490].
|
Modified src/runtime/linklib/Makefile from [46d4ad5206] to [87f2019e8e].
1 2 3 4 5 6 7 | 1 2 3 4 5 6 7 8 9 10 11 12 | + - + + + | include ../../../extra.mk STATIC_LIB = libobjfw_rt.library.a SRCS = linklib.m include ../../../buildsys.mk CPPFLAGS += -I.. -I../.. -I../../.. \ |
Modified src/runtime/linklib/linklib.m from [d6e0a7e003] to [824a5b579c].
︙ | |||
92 93 94 95 96 97 98 | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 | - - + + + - + | .__register_frame_info = __register_frame_info, .__deregister_frame_info = __deregister_frame_info, }; if (initialized) return; |
︙ |
Added src/runtime/morphos.sfd version [7018b90896].
|
Modified tests/Makefile from [c16bda6408] to [7bd30502da].
︙ | |||
77 78 79 80 81 82 83 | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | - + | run: rm -f libobjfw.so.${OBJFW_LIB_MAJOR} rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} rm -f libobjfw.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR} rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR} rm -f libobjfw_rt.dll libobjfw_rt.${OBJFW_RT_LIB_MAJOR}.dylib |
︙ | |||
108 109 110 111 112 113 114 | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 | - - + + + | if test -f ../src/runtime/libobjfw_rt.dll; then \ ${LN_S} ../src/runtime/libobjfw_rt.dll libobjfw_rt.dll; \ fi if test -f ../src/runtime/libobjfw_rt.dylib; then \ ${LN_S} ../src/runtime/libobjfw_rt.dylib \ libobjfw_rt.${OBJFW_RT_LIB_MAJOR}.dylib; \ fi |
︙ |