# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1433964528 -10800
# Node ID 94b8ef9b8caa0ded39c7da8d8b7dca7361fb1b66
# Parent  dccbd7d65517d214fb6ccf8fc89a68f00d47eb3b
restored C++

diff -r dccbd7d65517 -r 94b8ef9b8caa android/Makefile
--- a/android/Makefile	Wed Jun 10 18:53:28 2015 +0300
+++ b/android/Makefile	Wed Jun 10 22:28:48 2015 +0300
@@ -10,7 +10,7 @@
 src += $(wildcard $(root)/src/android/*.c)
 jsrc = $(wildcard $(root)/src/android/*.java)
 
-obj = $(src:.c=.o)# $(ccsrc:.cc=.o)
+obj = $(src:.c=.o) $(ccsrc:.cc=.o)
 lib = libs/armeabi/lib$(name).so
 apk-release = bin/$(name).apk
 apk-debug = bin/$(name)-debug.apk
@@ -23,8 +23,7 @@
 
 #android_usr = $(NDK)/platforms/$(android_platform)/arch-arm/usr
 android_inc = -I$(native_app_glue_dir)
-#android_libs = -lstdc++ -llog -landroid -lEGL -lGLESv2
-android_libs = -llog -landroid -lEGL -lGLESv2
+android_libs = -lstdc++ -llog -landroid -lEGL -lGLESv2
 
 defs += -DANDROID -DAPP_NAME=\"$(name)\"
 CXXFLAGS = -Wall -g $(defs) -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 \
@@ -57,7 +56,7 @@
 
 $(lib): $(obj)
 	@mkdir -p libs/armeabi
-	$(CC) -o $@ -shared $(obj) $(LDFLAGS)
+	$(CXX) -o $@ -shared $(obj) $(LDFLAGS)
 
 ant_files = *.xml *.properties proguard-project.txt
 ant_dirs = bin libs res obj src gen
@@ -101,4 +100,4 @@
 
 .PHONY: logcat
 logcat:
-	adb logcat '$(name):V' 'DEBUG:V' '*:S'
+	adb logcat $(name):V AndroidRuntime:V DEBUG:V '*:S'