1.1 --- a/android/Makefile	Wed Jun 10 06:56:27 2015 +0300
     1.2 +++ b/android/Makefile	Wed Jun 10 18:53:28 2015 +0300
     1.3 @@ -2,7 +2,7 @@
     1.4  include $(root)/proj.mk
     1.5  
     1.6  # --- android settings ---
     1.7 -android_platform = android-22
     1.8 +android_platform = android-19
     1.9  name = $(bin)
    1.10  pkgprefix = com.mutantstargoat
    1.11  # ------------------------
    1.12 @@ -10,7 +10,7 @@
    1.13  src += $(wildcard $(root)/src/android/*.c)
    1.14  jsrc = $(wildcard $(root)/src/android/*.java)
    1.15  
    1.16 -obj = $(src:.c=.o) $(ccsrc:.cc=.o)
    1.17 +obj = $(src:.c=.o)# $(ccsrc:.cc=.o)
    1.18  lib = libs/armeabi/lib$(name).so
    1.19  apk-release = bin/$(name).apk
    1.20  apk-debug = bin/$(name)-debug.apk
    1.21 @@ -21,9 +21,10 @@
    1.22  CC = arm-linux-androideabi-gcc
    1.23  CXX = arm-linux-androideabi-g++
    1.24  
    1.25 -android_usr = $(NDK)/platforms/$(android_platform)/arch-arm/usr
    1.26 +#android_usr = $(NDK)/platforms/$(android_platform)/arch-arm/usr
    1.27  android_inc = -I$(native_app_glue_dir)
    1.28 -android_libs = -lstdc++ -llog -landroid -lEGL -lGLESv2
    1.29 +#android_libs = -lstdc++ -llog -landroid -lEGL -lGLESv2
    1.30 +android_libs = -llog -landroid -lEGL -lGLESv2
    1.31  
    1.32  defs += -DANDROID -DAPP_NAME=\"$(name)\"
    1.33  CXXFLAGS = -Wall -g $(defs) -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 \
    1.34 @@ -56,7 +57,7 @@
    1.35  
    1.36  $(lib): $(obj)
    1.37  	@mkdir -p libs/armeabi
    1.38 -	$(CXX) -o $@ -shared $(obj) $(LDFLAGS)
    1.39 +	$(CC) -o $@ -shared $(obj) $(LDFLAGS)
    1.40  
    1.41  ant_files = *.xml *.properties proguard-project.txt
    1.42  ant_dirs = bin libs res obj src gen
    1.43 @@ -97,3 +98,7 @@
    1.44  .PHONY: update-project
    1.45  update-project: build.xml
    1.46  	android update project -p . -t $(android_platform)
    1.47 +
    1.48 +.PHONY: logcat
    1.49 +logcat:
    1.50 +	adb logcat '$(name):V' 'DEBUG:V' '*:S'