diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-05-18 17:02:33 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-05-18 17:02:33 -0700 |
| commit | 34d165185730eac6ddc4e7a23d192d22aa3d4dfb (patch) | |
| tree | 8f65fdba4ae95ef1f4e96e5492943d581637cbce /Makefile | |
| parent | 54808b6e68ab5be7d2a10b772f1ae4f569d542a1 (diff) | |
| download | external_qemu-34d165185730eac6ddc4e7a23d192d22aa3d4dfb.zip external_qemu-34d165185730eac6ddc4e7a23d192d22aa3d4dfb.tar.gz external_qemu-34d165185730eac6ddc4e7a23d192d22aa3d4dfb.tar.bz2 | |
Build SDL from sources directly.
This removes the requirement to build the SDL library before the rest
of the emulator. The prebuilt SDL library and installation is now optional
and is only kept for the full Android build on Linux (mainly to avoid having
to install many dev libraries on build servers).
This patch affects both the Android and standalone build systems.
The script android-configure.sh will not use a prebuilt SDL installation
unless you explicitely use --sdl-config=<script>.
Tested for linux-x86 / darwin-x86 / cygwin / linux-mingw builds.
Change-Id: If973b2ad199f06aeeff43aec387d1ac629487529
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -46,11 +46,12 @@ all: libraries executables EXECUTABLES := LIBRARIES := -SDL_CONFIG ?= $(PREBUILT)/sdl/bin/sdl-config +ifneq ($(SDL_CONFIG),) SDL_LIBS := $(filter %.a,$(shell $(SDL_CONFIG) --static-libs)) $(foreach lib,$(SDL_LIBS), \ $(eval $(call copy-prebuilt-lib,$(lib))) \ ) +endif clean: clean-intermediates @@ -70,4 +71,4 @@ clean-config: # include dependency information DEPENDENCY_DIRS := $(sort $(DEPENDENCY_DIRS)) --include $(wildcard $(DEPENDENCY_DIRS:%=%/*.d))
\ No newline at end of file +-include $(wildcard $(DEPENDENCY_DIRS:%=%/*.d)) |