From 43bac59b8b50f42fdb71fe0c11967e498386d124 Mon Sep 17 00:00:00 2001 From: Samuel Asher Rivello <63511769+SamuelAsherRivello@users.noreply.github.com> Date: Fri, 6 Sep 2024 13:03:00 -0500 Subject: [PATCH 1/2] Add C++ iostream logging to VS Code terminal window --- Makefile | 2 +- src/main.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 01600bf..5b83bfa 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ ifeq ($(OS), Windows_NT) # Set Windows macros platform := Windows CXX ?= g++ - linkFlags += -Wl,--allow-multiple-definition -pthread -lopengl32 -lgdi32 -lwinmm -mwindows -static -static-libgcc -static-libstdc++ + linkFlags += -Wl,--allow-multiple-definition -pthread -lopengl32 -lgdi32 -lwinmm -static -static-libgcc -static-libstdc++ THEN := && PATHSEP := \$(BLANK) MKDIR := -mkdir -p diff --git a/src/main.cpp b/src/main.cpp index d5dd4d7..4a66f97 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,5 @@ #include +#include int main() { @@ -11,6 +12,9 @@ int main() { SetTargetFPS(60); + // Demostrate logging + std::cout << "Hello World!" << std::endl; + // Main game loop while (!w.ShouldClose()) // Detect window close button or ESC key { From 4dbf7971ccf4e87dd36c8d1ede478e39a1377a18 Mon Sep 17 00:00:00 2001 From: Samuel Asher Rivello <63511769+SamuelAsherRivello@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:22:04 -0500 Subject: [PATCH 2/2] Address PR Feedback * Revert main.cpp code to match the main branch * Update README.md to add contributor --- README.md | 2 ++ src/main.cpp | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 114d32b..d1c63bb 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,8 @@ It's pretty simple actually: - [rafaeldelboni](https://github.com/rafaeldelboni) Rafael Delboni - contributor - [jason-cannon](https://github.com/jason-cannon) Jason Cannon - contributor - [return215](https://github.com/return215) Muhammad Hidayat - contributor +- [Samuel Asher Rivello](https://github.com/SamuelAsherRivello) - contributor + ## Licence diff --git a/src/main.cpp b/src/main.cpp index 4a66f97..d5dd4d7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,4 @@ #include -#include int main() { @@ -12,9 +11,6 @@ int main() { SetTargetFPS(60); - // Demostrate logging - std::cout << "Hello World!" << std::endl; - // Main game loop while (!w.ShouldClose()) // Detect window close button or ESC key {