Fix Windows compile errors in plug-and-play: missing windows.h, coroutine guard, -fcoroutines

pepc84 · pepc84 · commit 19db1667fc17 · 2026-07-22T12:49:40.000-07:00
- Processing.h: explicitly include &lt;windows.h&gt; and &lt;shellapi.h&gt; on Windows
  before any Win32 API usage. Previously relied on &lt;GL/glew.h&gt; pulling it
  in transitively, which broke when compiling Processing.cpp directly via
  run.bat (WIN32_FIND_DATAA, HANDLE, MessageBoxA, AllocConsole etc. all
  undeclared).
- Processing.h: guard &lt;coroutine&gt; with __cpp_impl_coroutine feature-test
  macro -- GCC 16 made -fcoroutines mandatory and errors without it.
- generate_plugandplay.py: add -fcoroutines to all Windows g++ invocations
  in run.bat template so coroutines work when user sketches need them.
- Regenerated processing-cpp-plugandplay.zip
diff --git a/dist/processing-cpp-plugandplay.zip b/dist/processing-cpp-plugandplay.zip
diff --git a/scripts/generate_plugandplay.py b/scripts/generate_plugandplay.py
@@ -596,9 +596,9 @@ def generate(out_dir: Path) -> None:
 
 if %NEED_ENGINE_BUILD%==1 (
     echo Compiling engine ^(first run; ~10-15s^)...
-    call :run_build_step "engine compile" g++ -std=c++17 -O2 -c -I"%ENGINE_DIR%include" %DEFINES% "%ENGINE_DIR%src\\Processing.cpp" -o "%LIB_DIR%\\Processing.o"
+    call :run_build_step "engine compile" g++ -std=c++17 -fcoroutines -O2 -c -I"%ENGINE_DIR%include" %DEFINES% "%ENGINE_DIR%src\\Processing.cpp" -o "%LIB_DIR%\\Processing.o"
     if errorlevel 1 exit /b 1
-    call :run_build_step "engine compile" g++ -std=c++17 -O2 -c -I"%ENGINE_DIR%include" %DEFINES% "%ENGINE_DIR%src\\Processing_defaults.cpp" -o "%LIB_DIR%\\Processing_defaults.o"
+    call :run_build_step "engine compile" g++ -std=c++17 -fcoroutines -O2 -c -I"%ENGINE_DIR%include" %DEFINES% "%ENGINE_DIR%src\\Processing_defaults.cpp" -o "%LIB_DIR%\\Processing_defaults.o"
     if errorlevel 1 exit /b 1
     ar rcs "%LIB_A%" "%LIB_DIR%\\Processing.o" "%LIB_DIR%\\Processing_defaults.o"
     del "%LIB_DIR%\\Processing.o" "%LIB_DIR%\\Processing_defaults.o"
@@ -616,11 +616,11 @@ def generate(out_dir: Path) -> None:
     REM by actually building this package and checking with the
     REM -Winvalid-pch warning flag -- it's not a build failure, the
     REM caching just quietly stops working).
-    call :run_build_step "header precompile" g++ -std=c++17 -I"%ENGINE_DIR%include" %DEFINES% -pthread -x c++-header "%ENGINE_DIR%include\\Processing.h" -o "%PCH_FILE%"
+    call :run_build_step "header precompile" g++ -std=c++17 -fcoroutines -I"%ENGINE_DIR%include" %DEFINES% -pthread -x c++-header "%ENGINE_DIR%include\\Processing.h" -o "%PCH_FILE%"
     if errorlevel 1 exit /b 1
 )
 
-call :run_build_step "sketch compile" g++ -std=c++17 -I"%ENGINE_DIR%include" %DEFINES% %SOURCES% -L"%LIB_DIR%" -lprocessing_cpp -lglfw3 -lglew32 -lopengl32 -lglu32 -lcomdlg32 -lshell32 -lole32 -luuid -mwindows -pthread -o "%PROJECT_DIR%\\.processing-cpp-build.exe"
+call :run_build_step "sketch compile" g++ -std=c++17 -fcoroutines -I"%ENGINE_DIR%include" %DEFINES% %SOURCES% -L"%LIB_DIR%" -lprocessing_cpp -lglfw3 -lglew32 -lopengl32 -lglu32 -lcomdlg32 -lshell32 -lole32 -luuid -mwindows -pthread -o "%PROJECT_DIR%\\.processing-cpp-build.exe"
 if errorlevel 1 exit /b 1
 
 echo Running...
diff --git a/src/Processing.h b/src/Processing.h
@@ -8,11 +8,29 @@
 #    include "stb_truetype.h"
 #  endif
 #endif
+// On Windows, include <windows.h> explicitly before anything else that needs
+// Win32 APIs (FindFirstFileA, MessageBoxA, AllocConsole, Sleep, etc.).
+// <GL/glew.h> pulls it in transitively but only after GLEW's own includes --
+// explicit include here guarantees it arrives before any Win32 API usage.
+#ifdef _WIN32
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  ifndef NOMINMAX
+#    define NOMINMAX
+#  endif
+#  include <windows.h>
+#  include <shellapi.h>
+#endif
 #ifndef _WIN32
 #include <dirent.h>
 #endif
 #include <functional>
+// <coroutine> requires -fcoroutines on GCC; guard it so the header compiles
+// without that flag when coroutines aren't needed by the user's sketch.
+#if defined(__cpp_impl_coroutine) || defined(__clang__) || defined(_MSC_VER) ||     (defined(__GNUC__) && defined(_GLIBCXX_COROUTINE))
 #include <coroutine>
+#endif
 // =============================================================================
 // Processing.h  --  processing-cpp API
 // =============================================================================
