ObjFW  Check-in [03a7cd6427]

Overview
Comment:Remove hack not necessary anymore.

It became obsolete with the last buildsys update.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 03a7cd6427837f542d56645413d36bb309436bb1af90330d5afab1c71a5ef141
User & Date: js on 2012-03-23 12:41:02
Other Links: manifest | tags
Context
2012-03-27
09:54
Update buildsys. check-in: bd6de09bbd user: js tags: trunk
09:42
Merge branch 'master' into bridge check-in: 2933c425bf user: js tags: bridge
2012-03-23
12:41
Remove hack not necessary anymore. check-in: 03a7cd6427 user: js tags: trunk
2012-03-21
20:28
Update buildsys. check-in: 8e0c9d89f9 user: js tags: trunk
Changes

Modified src/Makefile from [5510425993] to [f5abc14455].

95
96
97
98
99
100
101

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







+








	OFTCPSocket+SOCKS5.m		\
	${ASPRINTF_M}			\
	${FOUNDATION_COMPAT_M}		\
	iso_8859_15.m			\
	windows_1252.m			\
	${OBJC_PROPERTIES_M}		\
	${OBJC_SYNC_M}

OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_A}
LIB_OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_LIB_A}

include ../buildsys.mk

CPPFLAGS += -I. -I.. -Iexceptions
LD = ${OBJC}
LDFLAGS += ${REEXPORT_LIBOBJC} ${MACH_ALIAS_LIST}

Modified src/OFString_UTF8.h from [f6988d5f2e] to [716218f422].

15
16
17
18
19
20
21
22

23
24
25
26
27
28
29
15
16
17
18
19
20
21

22
23
24
25
26
27
28
29







-
+







 */

#import "OFString.h"

@interface OFString_UTF8: OFString
{
@public
	/*
	/**
	 * A pointer to the actual data.
	 *
	 * Since constant strings don't have s_store, they have to malloc it on
	 * the first access. Strings created at runtime just set the pointer to
	 * &s_store.
	 */
	struct of_string_utf8_ivars {

Modified utils/objfw-config.in from [cfdb4a0db9] to [d12bc5060e].

22
23
24
25
26
27
28
29

30
31
32
33
34
35
36
22
23
24
25
26
27
28

29
30
31
32
33
34
35
36







-
+







CPPFLAGS="-I@includedir@"
CXXFLAGS=""
OBJC="@OBJC@"
OBJCFLAGS="@GNU_RUNTIME@ -fexceptions -fobjc-exceptions"
OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstantString"
OBJCFLAGS="$OBJCFLAGS @NO_CONST_CFSTRINGS@ @BLOCKS_FLAGS@ @NO_WARN_UNUSED@"
LIB_CFLAGS="@LIB_CFLAGS@"
LIB_LDFLAGS='@LIB_LDFLAGS@'
LIB_LDFLAGS="@LIB_LDFLAGS@"
LIB_PREFIX="@LIB_PREFIX@"
LIB_SUFFIX="@LIB_SUFFIX@"
LDFLAGS=""
LDFLAGS_REEXPORT="@LDFLAGS_REEXPORT@"
LDFLAGS_RPATH="@LDFLAGS_RPATH@"
LIBS="-L${libdir} -lobjfw @LIBS@"
PLUGIN_CFLAGS="@PLUGIN_CFLAGS@"
104
105
106
107
108
109
110
111

112
113
114
115
116
117
118
119
104
105
106
107
108
109
110

111

112
113
114
115
116
117
118







-
+
-







			if test x"$SHARED_LIB" = x"" -o x"$LIB_MAJOR" = x"" \
			-o x"$LIB_MINOR" = x""; then
				printf "SHARED_LIB, LIB_MAJOR and " 2>&1
				echo "and LIB_MINOR to be set!" 1>&2
				exit 1
			fi

			eval "printf '%s' \"$(echo $LIB_LDFLAGS | \
			printf "%s" "$LIB_LDFLAGS"
				sed 's/\$\$/$/g')\""
			;;
		--lib-prefix)
			if test x"$LIB_MAJOR" = x"" -o x"$LIB_MINOR" = x""; then
				echo "LIB_MAJOR and LIB_MINOR need to be set!" \
					1>&2
				exit 1
			fi