diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | android/build/definitions.make | 2 | ||||
| -rw-r--r-- | distrib/sdl-1.2.12/Makefile.android | 4 | ||||
| -rwxr-xr-x | distrib/sdl-1.2.12/android-configure.sh | 2 |
4 files changed, 5 insertions, 4 deletions
@@ -19,6 +19,7 @@ BUILD_SYSTEM := android/build OBJS_DIR := objs +LIBS_DIR := $(OBJS_DIR)/libs CONFIG_MAKE := $(OBJS_DIR)/config.make CONFIG_H := $(OBJS_DIR)/config-host.h diff --git a/android/build/definitions.make b/android/build/definitions.make index ab9a34d..663899d 100644 --- a/android/build/definitions.make +++ b/android/build/definitions.make @@ -148,7 +148,7 @@ endef define copy-prebuilt-lib _SRC := $(1) _SRC1 := $$(notdir $$(_SRC)) -_DST := $$(OBJS_DIR)/$$(_SRC1) +_DST := $$(LIBS_DIR)/$$(_SRC1) LIBRARIES += $$(_DST) $$(_DST): PRIVATE_DST := $$(_DST) $$(_DST): PRIVATE_SRC := $$(_SRC) diff --git a/distrib/sdl-1.2.12/Makefile.android b/distrib/sdl-1.2.12/Makefile.android index 4e89fc7..2dfa7dd 100644 --- a/distrib/sdl-1.2.12/Makefile.android +++ b/distrib/sdl-1.2.12/Makefile.android @@ -85,8 +85,8 @@ SDL_HEADERS := \ $(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/libSDL.a,$(target)/lib/libSDL.a)) \ - $(eval $(call install-target,objs/libSDLmain.a,$(target)/lib/libSDLmain.a)) \ + $(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))) \ ) \ diff --git a/distrib/sdl-1.2.12/android-configure.sh b/distrib/sdl-1.2.12/android-configure.sh index 133daf4..95bb91f 100755 --- a/distrib/sdl-1.2.12/android-configure.sh +++ b/distrib/sdl-1.2.12/android-configure.sh @@ -479,7 +479,7 @@ generate_sdl_config () # replace @exec_prefix@ with "{prefix}", and @libdir@ with "{libdir}" cat > $TMPC <<EOF s!@exec_prefix@!\$\{prefix\}!g -s!@libdir@!\$\{exec_prefix\}/lib!g +s!@libdir@!\$\{exec_prefix\}/libs!g s!@includedir@!\$\{prefix\}/include!g EOF |