Skip to content

Commit

Permalink
Undo a mistaken commit setting fIsConsole on Win32/64.
Browse files Browse the repository at this point in the history
Undo a mistaken commit adding -mno-cygwin to the Win64 build.
Remove v3 from the makeall* script on 64-bit Mac OS X.
Fix a typo.
  • Loading branch information
eliotmiranda committed Jul 10, 2017
1 parent c5c935d commit 7bf9088
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 28 deletions.
4 changes: 2 additions & 2 deletions build.macos64x64/makeall
@@ -1,11 +1,11 @@
#!/bin/bash -e
trap 'exit 2' HUP INT PIPE TERM
for d in *.spur* *.v3; do
for d in *.spur*; do
if test -d "$d"; then
(cd ./$d;./mvm -A)
else
echo no $d directory found
fi
done
echo no news is good news...
grep -w error: *.spur/LOG* *.v3/LOG*
grep -w error: *.spur/LOG*
2 changes: 1 addition & 1 deletion build.macos64x64/makeallinstall
Expand Up @@ -7,7 +7,7 @@ REV=`grep 'GitRawRevisionString.*Rev:' "\`dirname $0\`/../platforms/Cross/vm/sqS
TAG=`date +%y.%U.`$REV
set -- Newspeak\ Spur\ Virtual\ Machine \
Pharo Cog Cog\ Spur
for td in newspeak.cog.spur pharo.cog.spur squeak.cog.v3 squeak.cog.spur; do
for td in newspeak.cog.spur pharo.cog.spur squeak.cog.spur; do
d=$td/installer
PRODUCT=$1-$TAG.dmg
if test -d "$d"; then
Expand Down
2 changes: 1 addition & 1 deletion build.win32x86/common/Makefile
@@ -1,5 +1,5 @@
#############################################################################
# COmmon Makefile for Win32 VM using gcc, cygwin and gnu make
# Common Makefile for Win32 VM using gcc, cygwin and gnu make
# Do make init to allow make -n to function.
#############################################################################

Expand Down
2 changes: 1 addition & 1 deletion build.win64x64/common/Makefile
@@ -1,5 +1,5 @@
#############################################################################
# COmmon Makefile for Win32 VM using gcc, cygwin and gnu make
# Common Makefile for Win32 VM using gcc, cygwin and gnu make
# Do make init to allow make -n to function.
#############################################################################

Expand Down
2 changes: 1 addition & 1 deletion build.win64x64/common/Makefile.tools
Expand Up @@ -67,7 +67,7 @@ LD:= $(CC)
LDCXX := $(TOOLPREFIX)clang++ # For linking c++ bundles

EXPORT:=--export-all-symbols
BASELDFLAGS:=-m64 -mno-cygwin -mthreads -Wl,$(EXPORT)
BASELDFLAGS:=-m64 -mthreads -Wl,$(EXPORT)
LDFLAGS:= -mwindows $(BASELDFLAGS)
CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS)
STDLIBS:= -lddraw -ldinput -lopengl32 -lws2_32 -lcomdlg32 -lole32 -lwinmm \
Expand Down
23 changes: 1 addition & 22 deletions platforms/win32/vm/sqWin32Main.c
Expand Up @@ -1601,28 +1601,7 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
* allocation failures unless running as a console app because doing so
* via a MessageBox will make the system unusable.
*/
#if 0
fIsConsole = GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &mode);
#elif 1 /* This way works */
{ CONSOLE_SCREEN_BUFFER_INFO csbi;

GetConsoleScreenBufferInfo( GetStdHandle( STD_OUTPUT_HANDLE), &csbi);

fIsConsole = csbi.dwCursorPosition.X || csbi.dwCursorPosition.Y;
}
#elif 1 /* This way works */
mode = 0;
GetConsoleMode(hInst, &mode);
printf("mode = %lx\n", mode);
fIsConsole = (mode & ENABLE_WINDOW_INPUT) == 0;
#else
GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &mode);
fIsConsole = (mode & ENABLE_WINDOW_INPUT) == 0;
#endif
#if 0
printf("fIsConsole = %d\n", fIsConsole);
exit(0);
#endif
fIsConsole = GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &mode);

/* fetch us a copy of the command line */
initialCmdLine = _strdup(lpCmdLine);
Expand Down

0 comments on commit 7bf9088

Please sign in to comment.