Overview
| Comment: | Unconditionally depend on libobjfw.a
It can only exist as a static library. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | objfwtest |
| Files: | files | file ages | folders |
| SHA3-256: |
6143f9a5ed6b839baf9713c9717ed35a |
| User & Date: | js on 2024-02-10 12:51:50 |
| Other Links: | branch diff | manifest | tags |
Context
|
2024-02-10
| ||
| 13:16 | Merge trunk into branch "objfwtest" check-in: ab933fe0e6 user: js tags: objfwtest | |
| 12:51 | Unconditionally depend on libobjfw.a check-in: 6143f9a5ed user: js tags: objfwtest | |
| 12:06 | Migrate OFPBKDF2Tests to ObjFWTest check-in: 7c509c3d51 user: js tags: objfwtest | |
Changes
Modified configure.ac from [760fa6e04d] to [c1b4a8e04b].
| ︙ | ︙ | |||
410 411 412 413 414 415 416 | AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework") build_framework="yes" ]) ], [ AC_DEFINE(OF_NO_SHARED, 1, [Whether no shared library was built]) AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a") AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a") | < | 410 411 412 413 414 415 416 417 418 419 420 421 422 423 |
AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework")
build_framework="yes"
])
], [
AC_DEFINE(OF_NO_SHARED, 1, [Whether no shared library was built])
AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a")
AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a")
])
AS_IF([test x"$build_framework" = x"yes"], [
TESTS_LIBS="-framework ObjFW \${RUNTIME_FRAMEWORK_LIBS} $TESTS_LIBS"
TESTS_LIBS="-F../src -F../src/runtime $TESTS_LIBS"
], [
TESTS_LIBS="\${RUNTIME_LIBS} $TESTS_LIBS"
|
| ︙ | ︙ |
Modified extra.mk.in from [ac9b8aa20c] to [6ed0317cce].
| ︙ | ︙ | |||
37 38 39 40 41 42 43 | EXCEPTIONS_A = @EXCEPTIONS_A@ EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@ FORWARDING_A = @FORWARDING_A@ FORWARDING_LIB_A = @FORWARDING_LIB_A@ LIBBASES_M = @LIBBASES_M@ LIBOBJFWRT_DEP = @LIBOBJFWRT_DEP@ LIBOBJFWRT_DEP_LVL2 = @LIBOBJFWRT_DEP_LVL2@ | < | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | EXCEPTIONS_A = @EXCEPTIONS_A@ EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@ FORWARDING_A = @FORWARDING_A@ FORWARDING_LIB_A = @FORWARDING_LIB_A@ LIBBASES_M = @LIBBASES_M@ LIBOBJFWRT_DEP = @LIBOBJFWRT_DEP@ LIBOBJFWRT_DEP_LVL2 = @LIBOBJFWRT_DEP_LVL2@ LIBOBJFW_DEP = @LIBOBJFW_DEP@ LIBOBJFW_DEP_LVL2 = @LIBOBJFW_DEP_LVL2@ LOOKUP_ASM_A = @LOOKUP_ASM_A@ LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LIB_A@ MAP_LDFLAGS = @MAP_LDFLAGS@ OBJC_SYNC = @OBJC_SYNC@ OBJFW_NEW = @OBJFW_NEW@ |
| ︙ | ︙ |
Modified new_tests/Makefile from [12d197ec78] to [a3f42aaff8].
| ︙ | ︙ | |||
85 86 87 88 89 90 91 |
mksfo "ObjFW Tests" PARAM.SFO
psp-strip ${PROG_NOINST}
pack-pbp $@ PARAM.SFO NULL NULL NULL NULL NULL ${PROG_NOINST} NULL
boot.dol: ${PROG_NOINST}
elf2dol ${PROG_NOINST} $@
| | | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 |
mksfo "ObjFW Tests" PARAM.SFO
psp-strip ${PROG_NOINST}
pack-pbp $@ PARAM.SFO NULL NULL NULL NULL NULL ${PROG_NOINST} NULL
boot.dol: ${PROG_NOINST}
elf2dol ${PROG_NOINST} $@
${PROG_NOINST}: ${LIBOBJFW_DEP} ${LIBOBJFWRT_DEP} ../src/test/libobjfwtest.a
${PROG_NOINST}.3dsx: ${PROG_NOINST}
3dsxtool $< $@
${PROG_NOINST}.arm9: ${PROG_NOINST}
arm-none-eabi-objcopy -O binary $< $@
|
| ︙ | ︙ |