Skip to content

Commit

Permalink
Merge pull request matricks#34 from oy/master
Browse files Browse the repository at this point in the history
few fixes for cl and gcc on windows
  • Loading branch information
Magnus Auvinen committed Jan 1, 2012
2 parents 17a8d24 + c0d7e24 commit 8c5b072
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
6 changes: 5 additions & 1 deletion src/driver_gcc.lua
Expand Up @@ -88,7 +88,11 @@ function SetDriversGCC(settings)
end

if settings.link then
settings.link.extension = ""
if family == "windows" then
settings.link.extension = ".exe"
else
settings.link.extension = ""
end
settings.link.exe = "g++"
settings.link.Driver = DriverGCC_Link
end
Expand Down
4 changes: 2 additions & 2 deletions src/node.h
Expand Up @@ -80,8 +80,8 @@ struct NODE
char *filter; /* filter string, first character sets the type of filter */

/* filename and the tool to build the resource */
unsigned cmdhash; /* hash of the command line for detecting changes */
unsigned cachehash; /* hash that should be written to the cache */
hash_t cmdhash; /* hash of the command line for detecting changes */
hash_t cachehash; /* hash that should be written to the cache */

unsigned constraint_exclusive_count; /* */
unsigned constraint_shared_count; /* */
Expand Down
6 changes: 6 additions & 0 deletions src/support.c
Expand Up @@ -383,6 +383,12 @@ static void passthru(FILE *fp)
}
#endif

#ifdef BAM_FAMILY_WINDOWS
/* forward declaration */
FILE *_popen(const char *, const char *);
int _pclose(FILE *);
#endif

int run_command(const char *cmd, const char *filter)
{
int ret;
Expand Down

0 comments on commit 8c5b072

Please sign in to comment.