Overview
| Comment: | Fix compilation with --disable-shared |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | gamecontroller |
| Files: | files | file ages | folders |
| SHA3-256: |
bb55076c9d9402cdef151729cfbaed1b |
| User & Date: | js on 2024-05-13 21:13:03 |
| Other Links: | branch diff | manifest | tags |
Context
|
2024-05-13
| ||
| 21:57 | Fix linking ObjFWHID on macOS and iOS check-in: 20122a7016 user: js tags: gamecontroller | |
| 21:13 | Fix compilation with --disable-shared check-in: bb55076c9d user: js tags: gamecontroller | |
| 20:57 | Move OFGameController into subframework ObjFWHID check-in: f5f12143ce user: js tags: gamecontroller | |
Changes
Modified configure.ac from [fa844e9fea] to [811c09f1d2].
| ︙ | ︙ | |||
424 425 426 427 428 429 430 | BUILDSYS_BUNDLE([ AC_SUBST(TESTPLUGIN_BUNDLE, "TestPlugin.bundle") ]) ], [ AC_DEFINE(OF_NO_SHARED, 1, [Whether no shared library was built]) AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a") AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a") | | | | 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 |
BUILDSYS_BUNDLE([
AC_SUBST(TESTPLUGIN_BUNDLE, "TestPlugin.bundle")
])
], [
AC_DEFINE(OF_NO_SHARED, 1, [Whether no shared library was built])
AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a")
AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a")
AC_SUBST(LIBOBJFWHID_DEP, "../src/hid/libobjfwhid.a")
AC_SUBST(LIBOBJFWHID_DEP_LVL2, "../../src/hid/libobjfwhid.a")
])
AS_IF([test x"$build_framework" = x"yes"], [
TESTS_LIBS="-framework ObjFW \${RUNTIME_FRAMEWORK_LIBS} $TESTS_LIBS"
TESTS_LIBS="-framework ObjFWHID $TESTS_LIBS"
TESTS_LIBS="-F../src -F../src/runtime $TESTS_LIBS"
], [
|
| ︙ | ︙ |
Modified tests/gamecontroller/Makefile from [b8a7f7f9c1] to [ea57a0665a].
| ︙ | ︙ | |||
93 94 95 96 97 98 99 |
${PROG_NOINST}: ${LIBOBJFW_DEP_LVL2} ${LIBOBJFWRT_DEP_LVL2} \
${LIBOBJFWHID_DEP_LVL2}
CPPFLAGS += -I../../src \
-I../../src/exceptions \
-I../../src/hid \
-I../../src/runtime \
| | > | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 |
${PROG_NOINST}: ${LIBOBJFW_DEP_LVL2} ${LIBOBJFWRT_DEP_LVL2} \
${LIBOBJFWHID_DEP_LVL2}
CPPFLAGS += -I../../src \
-I../../src/exceptions \
-I../../src/hid \
-I../../src/runtime \
-I../.. \
-DOBJFWHID_LOCAL_INCLUDES
LIBS := -L../../src/hid -lobjfwhid \
-L../../src -lobjfw \
-L../../src/runtime ${RUNTIME_LIBS} \
${LIBS}
LD = ${OBJC}
|