Просмотр исходного кода

Change winrt build to be less dependent on ANGLE

Now it does not try to build if the solution is not found. This way it's
possible to provide a minimal package with includes and libs and make it
build correctly.

Also remove messages from detect.py since it is ran for every platform
target.
George Marques 9 лет назад
Родитель
Сommit
477c770181
2 измененных файлов с 8 добавлено и 7 удалено
  1. 5 2
      platform/winrt/SCsub
  2. 3 5
      platform/winrt/detect.py

+ 5 - 2
platform/winrt/SCsub

@@ -15,7 +15,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])

+ 3 - 5
platform/winrt/detect.py

@@ -19,11 +19,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
@@ -58,6 +53,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)."