Overview
| Comment: | Make sure FRAMEWORK_LIBS is always set correctly |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
7615f3d657333d2f4b622f797918eee1 |
| User & Date: | js on 2018-01-21 22:29:09 |
| Other Links: | manifest | tags |
Context
|
2018-01-24
| ||
| 21:40 | Work around Apple assembler macros being different check-in: f38956ce92 user: js tags: trunk | |
|
2018-01-21
| ||
| 22:29 | Make sure FRAMEWORK_LIBS is always set correctly check-in: 7615f3d657 user: js tags: trunk | |
| 22:16 | Allow building the runtime as a .framework check-in: 0f42b0eafd user: js tags: trunk | |
Changes
Modified src/Makefile from [d05485b022] to [269300e669].
| ︙ | ︙ | |||
201 202 203 204 205 206 207 |
${FORWARDING_FORWARDING_LIB_A} \
${INVOCATION_INVOCATION_LIB_A}
include ../buildsys.mk
CPPFLAGS += -I. -I.. -Iexceptions -Iruntime
LD = ${OBJC}
| < | | | > > | 201 202 203 204 205 206 207 208 209 210 211 212 |
${FORWARDING_FORWARDING_LIB_A} \
${INVOCATION_INVOCATION_LIB_A}
include ../buildsys.mk
CPPFLAGS += -I. -I.. -Iexceptions -Iruntime
LD = ${OBJC}
FRAMEWORK_LIBS := -Fruntime \
${RUNTIME_FRAMEWORK_LIBS} \
${REEXPORT_RUNTIME_FRAMEWORK} \
${LIBS}
LIBS := -Lruntime ${RUNTIME_LIBS} ${REEXPORT_RUNTIME} ${LIBS}
|
Modified src/bridge/Makefile from [757b50f013] to [2f7998359b].
| ︙ | ︙ | |||
28 29 30 31 32 33 34 |
includesubdir = ObjFW_Bridge
include ../../buildsys.mk
CPPFLAGS += -I. -I.. -I../.. -I../exceptions -DOF_BRIDGE_LOCAL_INCLUDES
LD = ${OBJC}
| | | | 28 29 30 31 32 33 34 35 36 |
includesubdir = ObjFW_Bridge
include ../../buildsys.mk
CPPFLAGS += -I. -I.. -I../.. -I../exceptions -DOF_BRIDGE_LOCAL_INCLUDES
LD = ${OBJC}
FRAMEWORK_LIBS := -framework Foundation -F.. -framework ObjFW ${LIBS}
LIBS := -framework Foundation -L.. -lobjfw ${LIBS}
|
Modified src/runtime/Makefile from [c6d4eca569] to [309ef89018].
| ︙ | ︙ | |||
45 46 47 48 49 50 51 |
--inline $@
CPPFLAGS += -I. -I.. -I../.. \
-DOF_COMPILING_OBJFW_RT \
-DOBJFW_RT_LIB_MAJOR=${OBJFW_RT_LIB_MAJOR} \
-DOBJFW_RT_LIB_MINOR=${OBJFW_RT_LIB_MINOR}
LD = ${OBJC}
| > | 45 46 47 48 49 50 51 52 |
--inline $@
CPPFLAGS += -I. -I.. -I../.. \
-DOF_COMPILING_OBJFW_RT \
-DOBJFW_RT_LIB_MAJOR=${OBJFW_RT_LIB_MAJOR} \
-DOBJFW_RT_LIB_MINOR=${OBJFW_RT_LIB_MINOR}
LD = ${OBJC}
FRAMEWORK_LIBS = ${LIBS}
|
Modified src/runtime/morphos-library.m from [04b4a50718] to [1e4a1b451d].
| ︙ | ︙ | |||
128 129 130 131 132 133 134 | .rt_EndSkip = &resident + 1, .rt_Flags = RTF_AUTOINIT | RTF_PPC, .rt_Version = OBJFW_RT_LIB_MAJOR * 10 + OBJFW_RT_LIB_MINOR, .rt_Type = NT_LIBRARY, .rt_Pri = 0, .rt_Name = (char *)"objfw_rt.library", .rt_IdString = (char *)"ObjFW_RT " PACKAGE_VERSION | | | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 | .rt_EndSkip = &resident + 1, .rt_Flags = RTF_AUTOINIT | RTF_PPC, .rt_Version = OBJFW_RT_LIB_MAJOR * 10 + OBJFW_RT_LIB_MINOR, .rt_Type = NT_LIBRARY, .rt_Pri = 0, .rt_Name = (char *)"objfw_rt.library", .rt_IdString = (char *)"ObjFW_RT " PACKAGE_VERSION " \xA9 2008-2018 Jonathan Schleifer", .rt_Init = &init_table }; /* Magic required to make this a MorphOS binary */ const ULONG __abox__ = 1; /* Global variables needed by libnix */ |
| ︙ | ︙ |