diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-09-21 07:40:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-21 07:40:18 +0200 |
| commit | ae825c5c1873eb0e6713f39855c0bc8ccc788f64 (patch) | |
| tree | 18c8837cbe99df9e8d03196fc5427b4e3d2d0cde /platform | |
| parent | 1c50dfdf6c352574391c953d88732382adc15e83 (diff) | |
| parent | 5c21d49caf58d949baebfc605b8dc993428a3b7b (diff) | |
Merge pull request #6569 from vnen/winrt-build
Change winrt build to be less dependent on ANGLE
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/winrt/SCsub | 7 | ||||
| -rw-r--r-- | platform/winrt/detect.py | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/platform/winrt/SCsub b/platform/winrt/SCsub index ef7a653d53..fde0c11f3b 100644 --- a/platform/winrt/SCsub +++ b/platform/winrt/SCsub @@ -13,7 +13,10 @@ files = [ 'os_winrt.cpp', ] -cmd = env.AlwaysBuild(env.ANGLE('libANGLE.lib', None)) +if "build_angle" in env and env["build_angle"]: + cmd = env.AlwaysBuild(env.ANGLE('libANGLE.lib', None)) prog = env.Program('#bin/godot', files) -env.Depends(prog, [cmd]) + +if "build_angle" in env and env["build_angle"]: + env.Depends(prog, [cmd]) diff --git a/platform/winrt/detect.py b/platform/winrt/detect.py index 6ba4cf5cbc..7f220736d7 100644 --- a/platform/winrt/detect.py +++ b/platform/winrt/detect.py @@ -17,11 +17,6 @@ def can_build(): if (os.getenv("VSINSTALLDIR")): if (os.getenv("ANGLE_SRC_PATH") == None): - print("You need to define ANGLE_SRC_PATH to the path of ANGLE source root.") - return False - - if not os.path.isfile(str(os.getenv("ANGLE_SRC_PATH")) + "/winrt/10/src/angle.sln"): - print ("Couldn't find the ANGLE solution. Is ANGLE_SRC_PATH configured to the right path?") return False return True @@ -56,6 +51,9 @@ def configure(env): jobs = str(env.GetOption("num_jobs")) angle_build_cmd = "msbuild.exe " + angle_root + "/winrt/10/src/angle.sln /nologo /v:m /m:" + jobs + " /p:Configuration=Release /p:Platform=" + if os.path.isfile(str(os.getenv("ANGLE_SRC_PATH")) + "/winrt/10/src/angle.sln"): + env["build_angle"] = True + if os.getenv('Platform') == "ARM": print "Compiled program architecture will be an ARM executable. (forcing bits=32)." |