ObjFW  Check-in [314d4930d3]

Overview
Comment:Only use LIBOBJFW_DEP after including buildsys.mk

Otherwise, it does not work properly.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 314d4930d3860fb91d8036df751ca2cec321eae8b511ad03077a6916697a2208
User & Date: js on 2014-02-20 22:30:50
Other Links: manifest | tags
Context
2014-02-21
01:03
of_strdup: Add explicit cast for C++ compatibility check-in: 33676cd3a9 user: js tags: trunk
2014-02-20
22:30
Only use LIBOBJFW_DEP after including buildsys.mk check-in: 314d4930d3 user: js tags: trunk
22:29
Don't use __builtin_eh_return_data_regno for SjLj check-in: 65a0124f8d user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified tests/Makefile from [aaab7f7cc2] to [11cd785529].

︙
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112


113
114
115
116
117

94
95
96
97
98
99
100


101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117








-
-










+
+






	adb push testfile.bin /data/local/tmp/objfw/testfile.bin
	adb push testfile.txt /data/local/tmp/objfw/testfile.txt
	adb push testfile.ini /data/local/tmp/objfw/testfile.ini
	adb push serialization.xml /data/local/tmp/objfw/serialization.xml
	echo "Running tests binary on Android device..."
	adb shell 'cd /data/local/tmp/objfw && ./tests'

${PROG_NOINST}: ${LIBOBJFW_DEP}

EBOOT.PBP: ${PROG_NOINST}
	psp-fixup-imports ${PROG_NOINST}
	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} $@

include ../buildsys.mk

${PROG_NOINST}: ${LIBOBJFW_DEP}

CPPFLAGS += -I../src -I../src/exceptions -I../src/runtime -I.. -DSTDOUT
LIBS := -L../src -lobjfw ${TESTS_LIBS} ${LIBS}
LDFLAGS += ${MAP_LDFLAGS}
LD = ${OBJC}

Modified utils/Makefile from [8ff273d85e] to [4d0affac3b]. 

1
2
3
4
5
6

7
8

9
10
11
12
13
14
15

1
2
3
4
5

6
7

8
9
10
11
12
13
14
15






-
+

-
+








include ../extra.mk

PROG = ${OFZIP}
SRCS = OFZIP.m

${PROG}: ${LIBOBJFW_DEP}
include ../buildsys.mk

include ../buildsys.mk
${PROG}: ${LIBOBJFW_DEP}

DISTCLEAN = objfw-config

install-extra: objfw-config objfw-compile
	for i in objfw-config objfw-compile; do \
		${INSTALL_STATUS}; \
		if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/${BIN_PREFIX}$$i; then \
︙