summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Miodrag Milanović <mmicko@gmail.com>2018-12-12 01:38:28 +0100
committer ajrhacker <ajrhacker@users.noreply.github.com>2018-12-11 19:38:27 -0500
commita45221458dfba557ae32c0073750a06deea3f45e (patch)
tree0c7edda0a7fc0ca38021374801f0e5b2e074a180 /makefile
parentff08c8cd4eb7004bac71652421b4aea987f5c468 (diff)
Android compile fix (#4395)
* Fix compile for Android, set API to 24 * Update Android Studio project to API 24 * Fixed project file to latest Android Studio * fix build with gradle alone
Diffstat (limited to 'makefile')
-rw-r--r--makefile32
1 files changed, 1 insertions, 31 deletions
diff --git a/makefile b/makefile
index 20dcf539872..11b5a3a27b1 100644
--- a/makefile
+++ b/makefile
@@ -907,7 +907,7 @@ endif
ifeq (posix,$(SHELLTYPE))
MKDIR = $(SILENT) mkdir -p "$(1)"
- COPY = $(SILENT) cp -fR "$(1)" "$(2)"
+ COPY = $(SILENT) cp -fR "$(1)"/* "$(2)"
else
MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0
COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" > nul || exit 0
@@ -1211,36 +1211,6 @@ android-arm64: android-ndk generate $(PROJECTDIR_SDL)/$(MAKETYPE)-android-arm64/
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-android-arm64 config=$(CONFIG)
#-------------------------------------------------
-# android-mips
-#-------------------------------------------------
-
-$(PROJECTDIR_SDL)/$(MAKETYPE)-android-mips/Makefile: makefile $(SCRIPTS) $(GENIE)
-ifndef ANDROID_NDK_MIPS
- $(error ANDROID_NDK_MIPS is not set)
-endif
- $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=3.8.0 --osd=sdl --targetos=android --PLATFORM=mips --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_X11=1 --DONT_USE_NETWORK=1 --NOASM=1 $(MAKETYPE)
-
-.PHONY: android-mips
-android-mips: android-ndk generate $(PROJECTDIR_SDL)/$(MAKETYPE)-android-mips/Makefile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-android-mips config=$(CONFIG) precompile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-android-mips config=$(CONFIG)
-
-#-------------------------------------------------
-# android-mips64
-#-------------------------------------------------
-
-$(PROJECTDIR_SDL)/$(MAKETYPE)-android-mips64/Makefile: makefile $(SCRIPTS) $(GENIE)
-ifndef ANDROID_NDK_MIPS64
- $(error ANDROID_NDK_MIPS64 is not set)
-endif
- $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips64 --gcc_version=3.8.0 --osd=sdl --targetos=android --PLATFORM=mips64 --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_X11=1 --DONT_USE_NETWORK=1 --NOASM=1 $(MAKETYPE)
-
-.PHONY: android-mips64
-android-mips64: android-ndk generate $(PROJECTDIR_SDL)/$(MAKETYPE)-android-mips64/Makefile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-android-mips64 config=$(CONFIG) precompile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-android-mips64 config=$(CONFIG)
-
-#-------------------------------------------------
# android-x86
#-------------------------------------------------