Show
Ignore:
Timestamp:
06/14/2007 06:03:41 AM (18 months ago)
Author:
moo
Message:

merged [412] from trunk, fix for new win32 build system

Location:
branches/1.2
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.2

    • Property svnmerge-integrated changed from /trunk:1-302,344-346,371,374-375,388,391,393,395,400,402-405,407,410 to /trunk:1-302,344-346,371,374-375,388,391,393,395,400,402-405,407,410,412

  • branches/1.2/config.w32

    r354 r413  
    8080 
    8181    var mfo = file_get_contents(mfofile); 
    82     mfo.match(/(.*\\xcache)\\xcache.obj/); 
     82    mfo.match(/(.*)\\xcache.obj:/); 
    8383    var builddir = RegExp.$1; 
    84     mfo.match(/(.*\$\(CC\).* )\/c.*\\xcache\\xcache.c.*/i); 
     84    mfo.match(/(.*\$\(CC\).* )\/c.*\\xcache.c.*/i); 
    8585    var ccrule = RegExp.$1; 
    8686