Mercurial > projects > ldc
comparison dmd/module.c @ 708:fd5665da3a27
Hopefully sensible command switch handling. Changed default ext to .o on Windows.
author | Christian Kamm <kamm incasoftware de> |
---|---|
date | Thu, 16 Oct 2008 22:07:02 +0200 |
parents | bfe5229f9d8e |
children | dc8b8b7ea0c1 |
comparison
equal
deleted
inserted
replaced
707:1556a9328ba1 | 708:fd5665da3a27 |
---|---|
164 argobj = FileName::combine(path, argobj); | 164 argobj = FileName::combine(path, argobj); |
165 } | 165 } |
166 | 166 |
167 FileName::ensurePathExists(FileName::path(argobj)); | 167 FileName::ensurePathExists(FileName::path(argobj)); |
168 | 168 |
169 if (forcename) | 169 // always append the extension! otherwise hard to make output switches consistent |
170 // if (forcename) | |
171 // return new File(argobj); | |
172 // else | |
173 // allow for .o and .obj on windows | |
174 #if _WIN32 | |
175 if (ext == global.params.objdir && FileName::ext(argobj) | |
176 && stricmp(FileName::ext(argobj), global.obj_ext_alt) == 0) | |
170 return new File(argobj); | 177 return new File(argobj); |
171 else | 178 #endif |
172 return new File(FileName::forceExt(argobj, ext)); | 179 return new File(FileName::forceExt(argobj, ext)); |
173 } | 180 } |
174 | 181 |
175 void Module::buildTargetFiles() | 182 void Module::buildTargetFiles() |
176 { | 183 { |
177 if(objfile && | 184 if(objfile && |