Overview
| Comment: | Fix a linker warning on macOS |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
a6e2670136bc0656d6ee66f38b61be6a |
| User & Date: | js on 2024-04-02 21:58:37 |
| Other Links: | manifest | tags |
Context
|
2024-04-02
| ||
| 22:05 | Fix another, new linker warning on macOS check-in: 6e6bb54df3 user: js tags: trunk | |
| 21:58 | Fix a linker warning on macOS check-in: a6e2670136 user: js tags: trunk | |
| 03:21 | Only align OFVector4D where necessary check-in: 1af54eb2c2 user: js tags: trunk | |
Changes
Modified configure.ac from [38cd9ece3e] to [ddd2b4c359].
| ︙ | ︙ | |||
198 199 200 201 202 203 204 205 206 207 208 209 210 211 | enable_files="no" # TODO enable_shared="no" # TODO enable_threads="no" # TODO enable_sockets="no" # TODO AC_DEFINE(OF_WII_U, 1, [Whether we are compiling for Wii U]) AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map']) ]) AC_ARG_WITH(nds, AS_HELP_STRING([--with-nds], [build for Nintendo DS])) AS_IF([test x"$with_nds" = x"yes"], [ AS_IF([test x"$DEVKITPRO" = x""], [ AC_MSG_ERROR([DEVKITPRO is not set! Please set DEVKITPRO.]) | > > > > > > | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 |
enable_files="no" # TODO
enable_shared="no" # TODO
enable_threads="no" # TODO
enable_sockets="no" # TODO
AC_DEFINE(OF_WII_U, 1, [Whether we are compiling for Wii U])
AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map'])
# Repetition of libraries is required for Wii U, as otherwise it cannot
# find main. Just moving -lobjfwtest later doesn't work either, as then
# the linker cannot find ObjFW symbols. So the only solution is to list
# everything twice, but hide it behind a variable because listing it
# twice causes a warning on macOS.
AC_SUBST(WII_U_TESTS_LIBS, '-lobjfwtest ${TESTS_LIBS} ${LIBS}')
])
AC_ARG_WITH(nds,
AS_HELP_STRING([--with-nds], [build for Nintendo DS]))
AS_IF([test x"$with_nds" = x"yes"], [
AS_IF([test x"$DEVKITPRO" = x""], [
AC_MSG_ERROR([DEVKITPRO is not set! Please set DEVKITPRO.])
|
| ︙ | ︙ |
Modified extra.mk.in from [c150e6f9f4] to [22670d3586].
| ︙ | ︙ | |||
90 91 92 93 94 95 96 97 | USE_SRCS_PLUGINS = @USE_SRCS_PLUGINS@ USE_SRCS_SOCKETS = @USE_SRCS_SOCKETS@ USE_SRCS_SUBPROCESSES = @USE_SRCS_SUBPROCESSES@ USE_SRCS_TAGGED_POINTERS = @USE_SRCS_TAGGED_POINTERS@ USE_SRCS_THREADS = @USE_SRCS_THREADS@ USE_SRCS_UNIX_SOCKETS = @USE_SRCS_UNIX_SOCKETS@ USE_SRCS_WINDOWS = @USE_SRCS_WINDOWS@ WRAPPER = @WRAPPER@ | > | 90 91 92 93 94 95 96 97 98 | USE_SRCS_PLUGINS = @USE_SRCS_PLUGINS@ USE_SRCS_SOCKETS = @USE_SRCS_SOCKETS@ USE_SRCS_SUBPROCESSES = @USE_SRCS_SUBPROCESSES@ USE_SRCS_TAGGED_POINTERS = @USE_SRCS_TAGGED_POINTERS@ USE_SRCS_THREADS = @USE_SRCS_THREADS@ USE_SRCS_UNIX_SOCKETS = @USE_SRCS_UNIX_SOCKETS@ USE_SRCS_WINDOWS = @USE_SRCS_WINDOWS@ WII_U_TESTS_LIBS = @WII_U_TESTS_LIBS@ WRAPPER = @WRAPPER@ |
Modified tests/Makefile from [9a520a5dc7] to [1f39142133].
| ︙ | ︙ | |||
229 230 231 232 233 234 235 |
-I../src/exceptions \
-I../src/runtime \
-I../src/test \
-I.. \
-DOBJFWTEST_LOCAL_INCLUDES \
-DPROG_SUFFIX=\"${PROG_SUFFIX}\"
OBJCFLAGS_RuntimeARCTests.m = -fobjc-arc -fobjc-arc-exceptions
| | | | > > | | | | < | < | 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 |
-I../src/exceptions \
-I../src/runtime \
-I../src/test \
-I.. \
-DOBJFWTEST_LOCAL_INCLUDES \
-DPROG_SUFFIX=\"${PROG_SUFFIX}\"
OBJCFLAGS_RuntimeARCTests.m = -fobjc-arc -fobjc-arc-exceptions
# Repetition of libraries is required for Wii U, as otherwise it cannot find
# main. Just moving -lobjfwtest later doesn't work either, as then the linker
# cannot find ObjFW symbols. So the only solution is to list everything twice,
# but hide it behind a variable because listing it twice causes a warning on
# macOS.
LIBS := -L../src/test \
-lobjfwtest \
${TESTS_LIBS} \
${LIBS} \
${WII_U_TESTS_LIBS}
LDFLAGS += ${MAP_LDFLAGS}
LD = ${OBJC}
|