Call example destructor on Android (Fixes #97)

2016-03-26 13:21:19 +01:00 · 2016-03-26 13:21:19 +01:00 · 4e689f3fee
commit 4e689f3fee
parent 2ed3e946b1
27 changed files with 27 additions and 27 deletions
--- a/bloom/bloom.cpp
+++ b/bloom/bloom.cpp
@ -1373,8 +1373,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/computeparticles/computeparticles.cpp
+++ b/computeparticles/computeparticles.cpp
@ -808,8 +808,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/computeshader/computeshader.cpp
+++ b/computeshader/computeshader.cpp
@ -903,8 +903,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/deferred/deferred.cpp
+++ b/deferred/deferred.cpp
@ -1360,8 +1360,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/displacement/displacement.cpp
+++ b/displacement/displacement.cpp
@ -689,8 +689,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/distancefieldfonts/distancefieldfonts.cpp
+++ b/distancefieldfonts/distancefieldfonts.cpp
@ -815,8 +815,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/gears/gears.cpp
+++ b/gears/gears.cpp
@ -454,8 +454,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/geometryshader/geometryshader.cpp
+++ b/geometryshader/geometryshader.cpp
@ -549,8 +549,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/instancing/instancing.cpp
+++ b/instancing/instancing.cpp
@ -552,8 +552,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/mesh/mesh.cpp
+++ b/mesh/mesh.cpp
@ -605,8 +605,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/occlusionquery/occlusionquery.cpp
+++ b/occlusionquery/occlusionquery.cpp
@ -744,8 +744,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/offscreen/offscreen.cpp
+++ b/offscreen/offscreen.cpp
@ -1188,8 +1188,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/parallaxmapping/parallaxmapping.cpp
+++ b/parallaxmapping/parallaxmapping.cpp
@ -681,8 +681,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/particlefire/particlefire.cpp
+++ b/particlefire/particlefire.cpp
@ -878,8 +878,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/pipelines/pipelines.cpp
+++ b/pipelines/pipelines.cpp
@ -644,8 +644,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/pushconstants/pushconstants.cpp
+++ b/pushconstants/pushconstants.cpp
@ -564,8 +564,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/radialblur/radialblur.cpp
+++ b/radialblur/radialblur.cpp
@ -1144,8 +1144,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/shadowmapping/shadowmapping.cpp
+++ b/shadowmapping/shadowmapping.cpp
@ -1232,8 +1232,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/shadowmappingomni/shadowmappingomni.cpp
+++ b/shadowmappingomni/shadowmappingomni.cpp
@ -1154,8 +1154,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/skeletalanimation/skeletalanimation.cpp
+++ b/skeletalanimation/skeletalanimation.cpp
@ -917,8 +917,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/sphericalenvmapping/sphericalenvmapping.cpp
+++ b/sphericalenvmapping/sphericalenvmapping.cpp
@ -567,8 +567,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/tessellation/tessellation.cpp
+++ b/tessellation/tessellation.cpp
@ -667,8 +667,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/texture/texture.cpp
+++ b/texture/texture.cpp
@ -961,8 +961,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/texturearray/texturearray.cpp
+++ b/texturearray/texturearray.cpp
@ -816,8 +816,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/texturecubemap/texturecubemap.cpp
+++ b/texturecubemap/texturecubemap.cpp
@ -818,8 +818,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/triangle/triangle.cpp
+++ b/triangle/triangle.cpp
@ -920,8 +920,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }
--- a/vulkanscene/vulkanscene.cpp
+++ b/vulkanscene/vulkanscene.cpp
@ -656,8 +656,8 @@ int main(const int argc, const char *argv[])
 	vulkanExample->prepare();
 #endif
 	vulkanExample->renderLoop();
-#if !defined(__ANDROID__)
 	delete(vulkanExample);
+#if !defined(__ANDROID__)
 	return 0;
 #endif
 }