Overview
Comment: | tests/Makefile: Fix merge conflict |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
429d9062668b2de30e5dd242478bd931 |
User & Date: | js on 2022-08-02 20:41:31 |
Other Links: | manifest | tags |
Context
2022-08-06
| ||
14:43 | Reorder node and network of IPX sockets check-in: ccc6a77c55 user: js tags: trunk | |
2022-08-02
| ||
20:41 | tests/Makefile: Fix merge conflict check-in: 429d906266 user: js tags: trunk | |
20:39 | tests: Remove obsolete #ifdef OF_HAVE_FILES check-in: 1bc0e98941 user: js tags: trunk | |
Changes
Modified tests/Makefile from [1d323ff042] to [d9b53558ee].
1 2 3 4 5 6 7 8 9 10 11 | include ../extra.mk SUBDIRS = ${TESTPLUGIN} \ ${OBJC_SYNC} \ terminal CLEAN = EBOOT.PBP \ boot.dol \ ${PROG_NOINST}.arm9 \ ${PROG_NOINST}.nds \ ${PROG_NOINST}.nro \ | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | include ../extra.mk SUBDIRS = ${TESTPLUGIN} \ ${OBJC_SYNC} \ terminal CLEAN = EBOOT.PBP \ boot.dol \ ${PROG_NOINST}.arm9 \ ${PROG_NOINST}.nds \ ${PROG_NOINST}.nro \ ${PROG_NOINST}.rpx \ serialization_xml.m \ testfile_bin.m DISTCLEAN = Info.plist PROG_NOINST = tests${PROG_SUFFIX} STATIC_LIB_NOINST = ${TESTS_STATIC_LIB} SRCS = ForwardingTests.m \ |
︙ | ︙ |