Merge branch 'main' of github.com:15-466/15-466-f23-base1

Maekfile.js

@@ -88,13 +88,6 @@ if (maek.OS === 'windows') {
 // rules generally look like:
 //  output = maek.RULE_NAME(input [, output] [, {options}])
 
-//use CHECK to print a message when something is missing
-//'[targets =] CHECK(targets, prerequisites, message)'
-// targets: array of targets the task produces (can include both files and ':abstract targets')
-// prerequisites: array of things that must exist before manual task message is printed
-// message: message to print if targets don't exist
-//returns targets: the targets the rule produces
-
 //the '[objFile =] CPP(cppFile [, objFileBase] [, options])' compiles a c++ file:
 // cppFile: name of c++ file to compile
 // objFileBase (optional): base name object file to produce (if not supplied, set to options.objDir + '/' + cppFile without the extension)
@@ -129,7 +122,7 @@ function init_maek() {
 
 	//standard libraries:
 	const path = require('path').posix; //NOTE: expect posix-style paths even on windows
-	const fsPromises = require('fs/promises');
+	const fsPromises = require('fs').promises;
 	const fs = require('fs');
 	const os = require('os');
 	const performance = require('perf_hooks').performance;
@@ -270,10 +263,8 @@ function init_maek() {
 		let cc, command;
 		cc = [...options.CPP, ...options.CPPFlags];
 		if (maek.OS === 'linux') {
-			//TODO: check on linux
 			command = [...cc, '-MD', '-MT', 'x ', '-MF', depsFile, '-c', '-o', objFile, cppFile];
 		} else if (maek.OS === 'macos') {
-			//TODO: check on macos
 			command = [...cc, '-MD', '-MT', 'x ', '-MF', depsFile, '-c', '-o', objFile, cppFile];
 		} else { //windows
 			command = [...cc, '/c', `/Fo${objFile}`, '/sourceDependencies', depsFile, '/Tp', cppFile];
@@ -680,7 +671,7 @@ function init_maek() {
 					task.failed = true;
 					//if -q flag is set, immediately cancel all jobs:
 					if (maek.QUIT_EAGERLY) {
-						CANCEL_ALL_TASKS = true; //set flag so obs cancel themselves
+						CANCEL_ALL_TASKS = true; //set flag so jobs cancel themselves
 					}
 				} else {
 					//don't expect any other exceptions, but if they do arise, re-throw 'em:

NEST.md

@@ -41,15 +41,15 @@ Setup for your development environment should be relatively simple:
 
  0. (Optional) Make sure your system is set up to make it easy to use your favorite code editor and git from the command prompt. So much nicer than using a GUI.
  1. Install one of our target C++ compilers:
- 	- Linux: g++
+	- Linux: g++
 	- MacOS: clang++ (from XCode). From the terminal: `xcode-select --install`
 	- Windows: Visual Studio Community 2022
  2. Install [node](https://node.js):
-    - Linux: e.g. `sudo apt-get install node`
+	- Linux: e.g. `sudo apt-get install node`
 	- MacOS: e.g. `brew install node`
 	- Windows: [download from node's web page](https://nodejs.org/en/download/)
  3. Extract an appropriate [release of nest-libs](https://github.com/15-466/nest-libs/releases) to a sibling of this folder:
-    - Linux: https://github.com/15-466/nest-libs/releases/download/v0.12/nest-libs-linux-v0.13.tar.gz
+	- Linux: https://github.com/15-466/nest-libs/releases/download/v0.12/nest-libs-linux-v0.13.tar.gz
 	- MacOS: https://github.com/15-466/nest-libs/releases/download/v0.12/nest-libs-macos-v0.13.tar.gz
 	- Windows: https://github.com/15-466/nest-libs/releases/download/v0.12/nest-libs-windows-v0.13.zip
 

main.cpp

@@ -63,7 +63,7 @@ int main(int argc, char **argv) {
 
 	//create window:
 	SDL_Window *window = SDL_CreateWindow(
-		"gp21 game1: remember to change your title", //TODO: remember to set a title for your game!
+		"gp23 game1: remember to change your title", //TODO: remember to set a title for your game!
 		SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
 		2*PPU466::ScreenWidth + 8, 2*PPU466::ScreenHeight + 8, //TODO: modify window size if you'd like
 		SDL_WINDOW_OPENGL