Overview
| Comment: | Reexport allegro_main on OS X. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
2c9f1864d545eb21d5d4468a38ace848 |
| User & Date: | js on 2012-08-26 12:34:16 |
| Other Links: | manifest | tags |
Context
|
2012-08-26
| ||
| 13:42 | Rename -[handleNextEvent] -> -[handleEvents]. check-in: d49c4b05b0 user: js tags: trunk | |
| 12:34 | Reexport allegro_main on OS X. check-in: 2c9f1864d5 user: js tags: trunk | |
| 12:25 | Add ObjGameKit.h. check-in: 4b97e65b21 user: js tags: trunk | |
Changes
Modified configure.ac from [3f73c44bb7] to [9b142bc8ab].
1 2 3 4 5 6 7 8 9 | AC_INIT(ObjGameKit, 0.1, js@webkeks.org) AC_CONFIG_SRCDIR(src) AC_CHECK_TOOL(OBJFW_CONFIG, objfw-config) AS_IF([test x"$OBJFW_CONFIG" = x""], [ AC_MSG_ERROR(You need ObjFW and objfw-config installed!) ]) test x"$OBJC" = x"" && OBJC="$($OBJFW_CONFIG --objc)" | > > | 1 2 3 4 5 6 7 8 9 10 11 | AC_INIT(ObjGameKit, 0.1, js@webkeks.org) AC_CONFIG_SRCDIR(src) AC_CANONICAL_HOST AC_CHECK_TOOL(OBJFW_CONFIG, objfw-config) AS_IF([test x"$OBJFW_CONFIG" = x""], [ AC_MSG_ERROR(You need ObjFW and objfw-config installed!) ]) test x"$OBJC" = x"" && OBJC="$($OBJFW_CONFIG --objc)" |
| ︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
PKG_CHECK_MODULES(allegro5, [allegro-5.0 allegro_main-5.0 allegro_image-5.0], [
CPPFLAGS="$CPPFLAGS $allegro5_CFLAGS"
LIBS="$LIBS $allegro5_LIBS"
], [
AC_MSG_ERROR(You need allegro{_main,_image}-5.0 installed!)
])
# We add -Werror after all tests in case some tests emit warnings
OBJCFLAGS="$OBJCFLAGS -Werror"
BUILDSYS_SHARED_LIB
BUILDSYS_INIT
BUILDSYS_TOUCH_DEPS
dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP)
AC_SUBST(CPPFLAGS)
AC_SUBST(PACKAGE, ObjGameKit)
| > > > > > > | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 |
PKG_CHECK_MODULES(allegro5, [allegro-5.0 allegro_main-5.0 allegro_image-5.0], [
CPPFLAGS="$CPPFLAGS $allegro5_CFLAGS"
LIBS="$LIBS $allegro5_LIBS"
], [
AC_MSG_ERROR(You need allegro{_main,_image}-5.0 installed!)
])
case "$host_os" in
darwin*)
AC_SUBST(REEXPORT_ALLEGRO, ["-Wl,-reexport-lallegro_main"])
;;
esac
# We add -Werror after all tests in case some tests emit warnings
OBJCFLAGS="$OBJCFLAGS -Werror"
BUILDSYS_SHARED_LIB
BUILDSYS_INIT
BUILDSYS_TOUCH_DEPS
dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP)
AC_SUBST(CPPFLAGS)
AC_SUBST(PACKAGE, ObjGameKit)
AC_CONFIG_FILES([buildsys.mk extra.mk])
AC_OUTPUT
|
Added extra.mk.in version [03cf4a8ac2].
> | 1 | REEXPORT_ALLEGRO = @REEXPORT_ALLEGRO@ |
Modified src/Makefile from [db52009ed2] to [7758cb7095].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 |
SHARED_LIB = ${LIB_PREFIX}objgamekit${LIB_SUFFIX}
LIB_MAJOR = 0
LIB_MINOR = 0
SRCS = OGKBitmap.m \
OGKDisplay.m \
OGKEvent.m \
OGKEventQueue.m
INCLUDES = ${SRCS:.m=.h} \
ObjGameKit.h
include ../buildsys.mk
CPPFLAGS += -DOGK_INTERNAL
LD = ${OBJC}
| > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 |
SHARED_LIB = ${LIB_PREFIX}objgamekit${LIB_SUFFIX}
LIB_MAJOR = 0
LIB_MINOR = 0
SRCS = OGKBitmap.m \
OGKDisplay.m \
OGKEvent.m \
OGKEventQueue.m
INCLUDES = ${SRCS:.m=.h} \
ObjGameKit.h
include ../buildsys.mk
include ../extra.mk
CPPFLAGS += -DOGK_INTERNAL
LD = ${OBJC}
LDFLAGS += ${REEXPORT_ALLEGRO}
|