3dphotoshoot
diff android/Makefile @ 10:c71c477521ca
converting to GLES2 and C++
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Sun, 31 May 2015 00:40:26 +0300 |
parents | 7f6e6eb3d20e |
children | abe7960e4a77 |
line diff
1.1 --- a/android/Makefile Mon May 25 05:27:26 2015 +0300 1.2 +++ b/android/Makefile Sun May 31 00:40:26 2015 +0300 1.3 @@ -23,10 +23,12 @@ 1.4 1.5 android_usr = $(NDK)/platforms/$(android_platform)/arch-arm/usr 1.6 android_inc = -I$(native_app_glue_dir) 1.7 -android_libs = -llog -landroid -lEGL -lGLESv1_CM 1.8 +android_libs = -lstdc++ -llog -landroid -lEGL -lGLESv2 1.9 1.10 -CFLAGS = -std=c99 -Wall -g -DAPP_NAME=\"$(name)\" -march=armv7-a -mfloat-abi=softfp \ 1.11 +defs += -DANDROID -DAPP_NAME=\"$(name)\" 1.12 +CXXFLAGS = -Wall -g $(defs) -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 \ 1.13 $(android_inc) -I$(root)/src/android -I$(root)/src/gles $(incpaths) 1.14 +CFLAGS = -std=c99 $(CXXFLAGS) 1.15 LDFLAGS = -Wl,--fix-cortex-a8 -Wl,-z,defs $(android_libs) $(libpaths) -lm 1.16 1.17 .PHONY: debug 1.18 @@ -46,7 +48,7 @@ 1.19 1.20 $(lib): $(obj) 1.21 @mkdir -p libs/armeabi 1.22 - $(CC) -o $@ -shared $(obj) $(LDFLAGS) 1.23 + $(CXX) -o $@ -shared $(obj) $(LDFLAGS) 1.24 1.25 ant_files = *.xml *.properties proguard-project.txt 1.26 ant_dirs = bin libs res obj src gen