Merge pull request HaxeFoundation#226 from dpeek/fix/find-haxelib

hughsando · hughsando · commit de9b94b071ca · 2015-05-11T23:40:43.000+08:00
Give priority to personal haxelib paths
diff --git a/src/hx/Lib.cpp b/src/hx/Lib.cpp
@@ -242,23 +242,31 @@ String FindHaxelib(String inLib)
           printf( haxepath.length ? "Found local .haxelib\n" : "No local .haxelib\n");
    #endif
 
+   if (haxepath.length==0)
+   {
+      haxepath = GetEnv("HAXELIB_PATH");
+      if (loadDebug)
+         printf("HAXELIB_PATH env:%s\n", haxepath.__s);
+   }
+
+   if (haxepath.length==0)
+   {
+       #ifdef _WIN32
+       String home = GetEnv("HOMEDRIVE") + GetEnv("HOMEPATH") + HX_CSTRING("/.haxelib");
+       #else
+       String home = GetEnv("HOME") + HX_CSTRING("/.haxelib");
+       #endif
+       haxepath = GetFileContents(home);
+       if (loadDebug)
+          printf("HAXEPATH home:%s\n", haxepath.__s);
+   }
+
    if (haxepath.length==0)
    {
       haxepath = GetEnv("HAXEPATH");
       if (loadDebug)
          printf("HAXEPATH env:%s\n", haxepath.__s);
-      if (haxepath.length==0)
-      {
-          #ifdef _WIN32
-          String home = GetEnv("HOMEDRIVE") + GetEnv("HOMEPATH") + HX_CSTRING("/.haxelib");
-          #else
-          String home = GetEnv("HOME") + HX_CSTRING("/.haxelib");
-          #endif
-          haxepath = GetFileContents(home);
-          if (loadDebug)
-             printf("HAXEPATH home:%s\n", haxepath.__s);
-      }
-      else
+      if (haxepath.length>0)
       {
          haxepath += HX_CSTRING("/lib");
       }
