D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-04-12 06:49:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix D1 build.

Browse Source 
This applies the changes from 9a3cdf2e to dmd/ as well.
This commit is contained in:
David Nadlinger
2012-09-16 22:04:39 +02:00
parent 6ecd2e993b
commit b11c49a9c9
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dmd/mars.c
View File

@@ -66,9 +66,7 @@ Global::Global()
bc_ext = "bc";
s_ext = "s";
obj_ext = "o";
#if _WIN32
obj_ext_alt = "obj";
#endif
copyright = "Copyright (c) 1999-2012 by Digital Mars and Tomas Lindquist Olsen";
written = "written by Walter Bright and Tomas Lindquist Olsen";

10
dmd/mars.h
View File

@@ -321,12 +321,10 @@ struct Global
const char *mars_ext;
const char *sym_ext;
const char *obj_ext;
#if _WIN32
char *obj_ext_alt;
#endif
char *ll_ext;
char *bc_ext;
char *s_ext;
const char *obj_ext_alt;
const char *ll_ext;
const char *bc_ext;
const char *s_ext;
const char *lib_ext;
const char *dll_ext;
const char *doc_ext; // for Ddoc generated files

2
dmd/module.c
View File

@@ -247,7 +247,7 @@ void Module::buildTargetFiles(bool singleObj)
else if (global.params.output_s)
objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.s_ext);
else
objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.obj_ext);
objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.params.os == OSWindows ? global.obj_ext_alt : global.obj_ext);
}
if(doDocComment && !docfile)
docfile = Module::buildFilePath(global.params.docname, global.params.docdir, global.doc_ext);