src/build/Common.bmake

@@ -92,6 +92,10 @@
  QUIET	=	@
 !endif
 
+!ifndef 3RDP_ROOT
+ 3RDP_ROOT = $(SRC_ROOT)/../3rdp
+!endif
+
 # OS-specific
 DIRSEP	=	\	# This comment is necessary
 EXEFILE	=	.exe

src/conio/ansi_cio.c

@@ -940,11 +940,11 @@ int ansi_writestr_cb(const unsigned char *str, size_t len)
 int ansi_initio_cb(void)
 {
 #ifdef _WIN32
+	DWORD conmode = 0;
 	if(isatty(fileno(stdin))) {
 		if(!SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), ENABLE_VIRTUAL_TERMINAL_INPUT))
 			return(0);
 
-		DWORD conmode = 0;
 		GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &conmode);
 		if(!SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), conmode | ENABLE_VIRTUAL_TERMINAL_PROCESSING))
 			return(0);

src/conio/ciolib.c

@@ -39,7 +39,6 @@
 #include <stdarg.h>
 #include <stdlib.h>	/* alloca */
 #include <stdio.h>
-#include <stdbool.h>
 #if defined(_WIN32)
  #include <malloc.h>	/* alloca() on Win32 */
 #endif
@@ -1677,7 +1676,7 @@ CIOLIBEXPORT struct ciolib_screen * CIOLIBCALL ciolib_savescreen(void)
 	}
 
 	if (vmode != -1) {
-		ret->pixels = ciolib_getpixels(0, 0, vparams[vmode].charwidth * vparams[vmode].cols - 1, vparams[vmode].charheight * vparams[vmode].rows - 1, true);
+		ret->pixels = ciolib_getpixels(0, 0, vparams[vmode].charwidth * vparams[vmode].cols - 1, vparams[vmode].charheight * vparams[vmode].rows - 1, TRUE);
 	}
 	ciolib_vmem_gettext(1, 1, ret->text_info.screenwidth, ret->text_info.screenheight, ret->vmem);
 	ret->fg_colour = ciolib_fg;