From e4c5d95ed37611acc6a186522315195b4ebfb9ef Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 9 Jul 2012 11:42:54 -0700
Subject: Apply Android changes from sdl-1.2.12 to sdl-1.2.15

These changes come from diffing Android's sdl-1.2.12 tree against a
pure upstream sdl-1.2.12 tree, and then manually applying those
differences to the sdl-1.2.15 tree.

Change-Id: I05fa6e8004bb629fa2482f092b6ab127b7e51e73
---
 distrib/sdl-1.2.15/Makefile.android | 93 +++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 distrib/sdl-1.2.15/Makefile.android

(limited to 'distrib/sdl-1.2.15/Makefile.android')

diff --git a/distrib/sdl-1.2.15/Makefile.android b/distrib/sdl-1.2.15/Makefile.android
new file mode 100644
index 0000000..2dfa7dd
--- /dev/null
+++ b/distrib/sdl-1.2.15/Makefile.android
@@ -0,0 +1,93 @@
+LOCAL_PATH:= $(call my-dir)
+
+SDL_DIR := $(LOCAL_PATH)
+include $(SDL_DIR)/sources.make
+
+CONFIG_DIRS     := \
+    $(LOCAL_PATH)/objs \
+    $(LOCAL_PATH)/include \
+    $(LOCAL_PATH) \
+
+CONFIG_INCLUDES := $(CONFIG_DIRS:%=-I%)
+
+MY_CC      := $(CC)
+MY_LD      := $(LD)
+MY_CFLAGS  := $(CFLAGS) $(CONFIG_INCLUDES)
+MY_LDFLAGS := $(LDFLAGS)
+
+include $(CLEAR_VARS)
+
+LOCAL_NO_DEFAULT_COMPILER_FLAGS := true
+LOCAL_CC                        := $(MY_CC)
+LOCAL_CFLAGS                    := $(MY_CFLAGS) $(LOCAL_CFLAGS)
+LOCAL_LDFLAGS                   := $(MY_LDFLAGS) $(LOCAL_LDFLAGS)
+
+LOCAL_MODULE := libSDL
+
+LOCAL_SRC_FILES := $(SDL_SOURCES)
+
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+## Build libSDLmain
+##
+
+include $(CLEAR_VARS)
+
+LOCAL_NO_DEFAULT_COMPILER_FLAGS := true
+LOCAL_CC                        := $(MY_CC)
+LOCAL_CFLAGS                    := $(MY_CFLAGS) $(LOCAL_CFLAGS)
+LOCAL_LDFLAGS                   := $(MY_LDFLAGS) $(LOCAL_LDFLAGS)
+
+LOCAL_MODULE := libSDLmain
+
+LOCAL_SRC_FILES := $(SDLMAIN_SOURCES)
+
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# handle installation of generated files
+#
+
+SDL_HEADERS := \
+	SDL.h \
+	SDL_active.h \
+	SDL_audio.h \
+	SDL_byteorder.h \
+	SDL_cdrom.h \
+	SDL_copying.h \
+	SDL_cpuinfo.h \
+	SDL_endian.h \
+	SDL_error.h \
+	SDL_events.h \
+	SDL_getenv.h \
+	SDL_joystick.h \
+	SDL_keyboard.h \
+	SDL_keysym.h \
+	SDL_loadso.h \
+	SDL_main.h \
+	SDL_mouse.h \
+	SDL_mutex.h \
+	SDL_name.h \
+	SDL_opengl.h \
+	SDL_platform.h \
+	SDL_quit.h \
+	SDL_rwops.h \
+	SDL_stdinc.h \
+	SDL_syswm.h \
+	SDL_thread.h \
+	SDL_timer.h \
+	SDL_types.h \
+	SDL_version.h \
+	SDL_video.h \
+	begin_code.h \
+	close_code.h \
+
+
+$(foreach target,$(INSTALL_TARGETS),\
+  $(eval $(call install-target,objs/sdl-config,$(target)/bin/sdl-config)) \
+  $(eval $(call install-target,objs/SDL_config.h,$(target)/include/SDL/SDL_config.h)) \
+  $(eval $(call install-target,objs/libs/libSDL.a,$(target)/libs/libSDL.a)) \
+  $(eval $(call install-target,objs/libs/libSDLmain.a,$(target)/libs/libSDLmain.a)) \
+  $(foreach header,$(SDL_HEADERS), \
+    $(eval $(call install-target,include/$(header),$(target)/include/SDL/$(header))) \
+  ) \
+)
-- 
cgit v1.1