D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-02-15 03:13:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of isLinux and isWindows in favor of global.params.os.

Browse Source
This commit is contained in:
Christian Kamm
2008-08-24 16:22:58 +02:00
parent fa6f277bdd
commit 72a2db6d7c
4 changed files with 59 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gen/linker.cpp
View File

@@ -72,7 +72,7 @@ int linkExecutable(const char* argv0)
else
exestr = "a.out";
}
if (global.params.isWindows)
if (global.params.os == OSWindows)
exestr.append(".exe");
std::string outopt = "-o=" + exestr;
@@ -151,13 +151,13 @@ int linkExecutable(const char* argv0)
}
// default libs
if(global.params.isLinux)
if(global.params.os == OSLinux)
{
args.push_back("-lpthread");
args.push_back("-ldl");
args.push_back("-lm");
}
else if (global.params.isWindows)
else if (global.params.os == OSWindows)
{
// FIXME: I'd assume kernel32 etc
}
@@ -174,12 +174,11 @@ int linkExecutable(const char* argv0)
std::string runtime_path(global.params.runtimePath);
// path seperator can be \ on windows, but we check for /
if (global.params.isWindows)
{
int i=0;
while ((i = runtime_path.find("\\", i)) > 0)
runtime_path.replace(i, 1, "/");
}
#if _WIN32
int i=0;
while ((i = runtime_path.find("\\", i)) > 0)
runtime_path.replace(i, 1, "/");
#endif
if (*runtime_path.rbegin() != '/')
runtime_path.append("/");