Skip to content

change to work on windows with msvc #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soumith merged 1 commit into from
Oct 13, 2016
Merged

change to work on windows with msvc #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qlua/qlua.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ main(int argc, char **argv)
args_for_lua += const_cast<char*>(ideStyle.constData());
}
#if defined(TORCH7)
args_for_lua += "-ltorch-env";
args_for_lua += "-lenv";
#endif
while(i < argc_for_both)
args_for_lua += argv_for_both[i++];
Expand Down
8 changes: 8 additions & 0 deletions qlua/qluaconsole_win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,11 +466,19 @@ QLuaConsole::Private::redirect(bool flag)
int fd1 = sThread.fds[1];
int fd2 = fd1;
if (! trueStdout)
#ifndef _MSC_VER
stdout->_file = 1;
#else
freopen("CON", "w", stdout);
#endif
else if (! flag)
fd1 = _fileno(trueStdout);
if (! trueStderr)
#ifndef _MSC_VER
stderr->_file = 2;
#else
freopen("CON", "w", stderr);
#endif
else if (! flag)
fd2 = _fileno(trueStderr);
_dup2(fd1, _fileno(stdout));
Expand Down