3dphotoshoot

changeset 19:94b8ef9b8caa

find changesets by author, revision, files, or words in the commit message
restored C++
author John Tsiombikas <nuclear@member.fsf.org>
date Wed, 10 Jun 2015 22:28:48 +0300
parents dccbd7d65517
children c14613d27a3a
files android/Makefile
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line diff
     1.1 --- a/android/Makefile	Wed Jun 10 18:53:28 2015 +0300
     1.2 +++ b/android/Makefile	Wed Jun 10 22:28:48 2015 +0300
     1.3 @@ -10,7 +10,7 @@
     1.4  src += $(wildcard $(root)/src/android/*.c)
     1.5  jsrc = $(wildcard $(root)/src/android/*.java)
     1.6  
     1.7 -obj = $(src:.c=.o)# $(ccsrc:.cc=.o)
     1.8 +obj = $(src:.c=.o) $(ccsrc:.cc=.o)
     1.9  lib = libs/armeabi/lib$(name).so
    1.10  apk-release = bin/$(name).apk
    1.11  apk-debug = bin/$(name)-debug.apk
    1.12 @@ -23,8 +23,7 @@
    1.13  
    1.14  #android_usr = $(NDK)/platforms/$(android_platform)/arch-arm/usr
    1.15  android_inc = -I$(native_app_glue_dir)
    1.16 -#android_libs = -lstdc++ -llog -landroid -lEGL -lGLESv2
    1.17 -android_libs = -llog -landroid -lEGL -lGLESv2
    1.18 +android_libs = -lstdc++ -llog -landroid -lEGL -lGLESv2
    1.19  
    1.20  defs += -DANDROID -DAPP_NAME=\"$(name)\"
    1.21  CXXFLAGS = -Wall -g $(defs) -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 \
    1.22 @@ -57,7 +56,7 @@
    1.23  
    1.24  $(lib): $(obj)
    1.25  	@mkdir -p libs/armeabi
    1.26 -	$(CC) -o $@ -shared $(obj) $(LDFLAGS)
    1.27 +	$(CXX) -o $@ -shared $(obj) $(LDFLAGS)
    1.28  
    1.29  ant_files = *.xml *.properties proguard-project.txt
    1.30  ant_dirs = bin libs res obj src gen
    1.31 @@ -101,4 +100,4 @@
    1.32  
    1.33  .PHONY: logcat
    1.34  logcat:
    1.35 -	adb logcat '$(name):V' 'DEBUG:V' '*:S'
    1.36 +	adb logcat $(name):V AndroidRuntime:V DEBUG:V '*:S'