ObjFW  Check-in [e3e38ed68d]

Overview
Comment:Do not use DATADIR as a define

This creates a conflict on Windows.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: e3e38ed68d6991c89efd2da5539df3cc4edc39f46c09c7ded033638d77ff01af
User & Date: js on 2017-01-10 19:51:12
Other Links: manifest | tags
Context
2017-01-10
19:58
OFLocalization: Properly lowercase the language check-in: 0f2ed1e510 user: js tags: trunk
19:51
Do not use DATADIR as a define check-in: e3e38ed68d user: js tags: trunk
19:39
Implement support for localized strings check-in: e731dc4c75 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified utils/ofhttp/Makefile from [f803e607df] to [6d028b0e9a].

︙
8
9
10
11
12
13
14
15
16
17
18
19





20
21
22

8
9
10
11
12
13
14





15
16
17
18
19
20
21
22








-
-
-
-
-
+
+
+
+
+





include ../../buildsys.mk

PACKAGE_NAME = ofhttp

${PROG}: ${LIBOBJFW_DEP_LVL2}

CPPFLAGS += -I../../src			\
	    -I../../src/runtime		\
	    -I../../src/exceptions	\
	    -I../..			\
	    -DDATADIR=\"${datadir}\"
CPPFLAGS += -I../../src					\
	    -I../../src/runtime				\
	    -I../../src/exceptions			\
	    -I../..					\
	    -DLANGUAGE_DIR=\"${datadir}/ofhttp/lang\"
LIBS := -L../../src -lobjfw ${LIBS}
LD = ${OBJC}
LDFLAGS += ${LDFLAGS_RPATH}

Modified utils/ofhttp/OFHTTP.m from [9a10462bff] to [b07f7b6ae5].

︙
243
244
245
246
247
248
249
250

251
252
253
254
255
256
257
258

243
244
245
246
247
248
249

250

251
252
253
254
255
256
257








-
+
-








		{ 'v', @"verbose", 0, &_verbose, NULL },
		{ '\0', nil, 0, NULL, NULL }
	};
	OFOptionsParser *optionsParser = [OFOptionsParser
	    parserWithOptions: options];
	of_unichar_t option;

	[OFLocalization addLanguageDirectory: [OFString pathWithComponents:
	[OFLocalization addLanguageDirectory: @LANGUAGE_DIR];
	    [OFArray arrayWithObjects: @DATADIR, @"ofhttp", @"lang", nil]]];

	while ((option = [optionsParser nextOption]) != '\0') {
		switch (option) {
		case 'b':
			[self setBody: [optionsParser argument]];
			break;
		case 'h':
︙

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.016s