X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=scons%2Fwcesdk.py;h=e82f255c515a7138a6629be3ce128c60e0621ba1;hb=bee901a1cf5f06a56c59189077d7f8c02a3af0d1;hp=bdaab7d19fd6503c7798c08f0fb32f3bdbb1b993;hpb=f78cc24c4b4f253223044b7019daf3e954f38a07;p=mesa.git

diff --git a/scons/wcesdk.py b/scons/wcesdk.py
index bdaab7d19fd..e82f255c515 100644
--- a/scons/wcesdk.py
+++ b/scons/wcesdk.py
@@ -76,6 +76,27 @@ def get_wce500_paths(env):
     exe_path = string.join(exe_paths, os.pathsep )
     return (include_path, lib_path, exe_path)
 
+def get_wce600_root(env):
+    try:
+        return os.environ['_WINCEROOT']
+    except KeyError:
+        pass
+
+    if SCons.Util.can_read_reg:
+        key = r'SOFTWARE\Microsoft\Platform Builder\6.00\Directories\OS Install Dir'
+        try:
+            path, t = SCons.Util.RegGetValue(SCons.Util.HKEY_LOCAL_MACHINE, key)
+        except SCons.Util.RegError:
+            pass
+        else:
+            return path
+
+    default_path = os.path.join(r'C:\WINCE600', version)
+    if os.path.exists(default_path):
+        return default_path
+    
+    return None 
+
 def get_wce600_paths(env):
     """Return a 3-tuple of (INCLUDE, LIB, PATH) as the values
     of those three environment variables that should be set
@@ -87,24 +108,27 @@ def get_wce600_paths(env):
 
     # See also C:\WINCE600\public\common\oak\misc\wince.bat
 
-    os_version = os.environ.get('_winceosver', '600')
-    wince_root = os.environ.get('_winceroot', r'C:\WINCE600')
-    platform_root = os.environ.get('_platformroot', os.path.join(wince_root, 'platform'))
-    sdk_root = os.environ.get('_sdkroot' ,os.path.join(wince_root, 'sdk'))
+    wince_root = get_wce600_root(env)
+    if wince_root is None:
+        raise SCons.Errors.InternalError, "Windows CE 6.0 SDK not found"
+    
+    os_version = os.environ.get('_WINCEOSVER', '600')
+    platform_root = os.environ.get('_PLATFORMROOT', os.path.join(wince_root, 'platform'))
+    sdk_root = os.environ.get('_SDKROOT' ,os.path.join(wince_root, 'sdk'))
 
-    platform_root = os.environ.get('_platformroot', os.path.join(wince_root, 'platform'))
-    sdk_root = os.environ.get('_sdkroot' ,os.path.join(wince_root, 'sdk'))
+    platform_root = os.environ.get('_PLATFORMROOT', os.path.join(wince_root, 'platform'))
+    sdk_root = os.environ.get('_SDKROOT' ,os.path.join(wince_root, 'sdk'))
 
-    host_cpu = os.environ.get('_hostcputype', 'i386')
-    target_cpu = os.environ.get('_tgtcpu', 'x86')
+    host_cpu = os.environ.get('_HOSTCPUTYPE', 'i386')
+    target_cpu = os.environ.get('_TGTCPU', 'x86')
 
-    if env['debug']:
+    if env['build'] == 'debug':
         build = 'debug'
     else:
         build = 'retail'
 
     try:
-        project_root = os.environ['_projectroot']
+        project_root = os.environ['_PROJECTROOT']
     except KeyError:
         # No project root defined -- use the common stuff instead
         project_root = os.path.join(wince_root, 'public', 'common')
@@ -147,12 +171,6 @@ def generate(env):
         pass
 
 def exists(env):
-    if not msvc_sa.exits(env):
-        return 0
-    if not mslib_sa.exits(env):
-        return 0
-    if not mslink_sa.exits(env):
-        return 0
-    return 1
+    return get_wce600_root(env) is not None
 
 # vim:set ts=4 sw=4 et: