Merge pull request #370 from sjfricke/master

added verification of submodules for android
This commit is contained in:
Sascha Willems 2017-09-02 14:04:24 +02:00 committed by GitHub
commit ff4e6e2877
2 changed files with 15 additions and 0 deletions

View file

@ -20,6 +20,10 @@ Since Vulkan is not yet part of the Android OS (like OpenGL ES) the library and
### Building the Examples ### Building the Examples
### Grab Externals
Make sure all submodules have been cloned using the [steps from main README](../README.md#cloning).
### Complete set ### Complete set
**Please note that building (and deploying) all examples may take a while** **Please note that building (and deploying) all examples may take a while**

View file

@ -11,6 +11,11 @@ SDK_VERSION = "android-23"
PROJECT_FOLDER = "" PROJECT_FOLDER = ""
# Check if python 3, python 2 not supported
if sys.version_info <= (3, 0):
print("Sorry, requires Python 3.x, not Python 2.x")
sys.exit(-1)
# Name/folder of the project to build # Name/folder of the project to build
if len(sys.argv) > 1: if len(sys.argv) > 1:
PROJECT_FOLDER = sys.argv[1] PROJECT_FOLDER = sys.argv[1]
@ -71,6 +76,12 @@ for arg in sys.argv[1:]:
BUILD_ARGS = "APP_CFLAGS=-D_VALIDATION" BUILD_ARGS = "APP_CFLAGS=-D_VALIDATION"
break break
# Verify submodules are loaded in external folder
if not os.listdir("../external/glm/") or not os.listdir("../external/gli/"):
print("External submodules not loaded. Clone them using:")
print("\tgit submodule init\n\tgit submodule update")
sys.exit(-1)
# Build # Build
os.chdir(PROJECT_FOLDER) os.chdir(PROJECT_FOLDER)