diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:24:31 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:24:31 +0100 |
commit | 1e9a681a0fc22e40abe393aa9f015a12f7b6dc63 (patch) | |
tree | 250019d7025db0f012d830cc7b257b091347f97f /package/sdl/Makefile | |
parent | bf73dab7201f06f26290c4ceb5cdcca603f027d7 (diff) | |
parent | 1b6a9fa3f18fdeaa3f3869a22cd91490ffec608c (diff) |
resolve merge conflict
Diffstat (limited to 'package/sdl/Makefile')
-rw-r--r-- | package/sdl/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/package/sdl/Makefile b/package/sdl/Makefile index ec5e394d0..bf6f4d06d 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -31,7 +31,15 @@ $(eval $(call HOST_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --without-x +HOST_CONFIGURE_ARGS+= --without-x \ + --disable-cdrom \ + --disable-joystick \ + --disable-audio \ + --disable-video \ + --disable-assembly \ + --disable-shared \ + --disable-video-cocoa \ + --disable-video-opengl ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y) CONFIGURE_ARGS+= --enable-input-tslib |