From 7dd3c90a77787df4645ed8d7baab64910aad5408 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Tue, 3 Jun 2025 22:40:11 -0700
Subject: [PATCH] Fix up various makefile-wsl (and -cygwin) errors pointed out
 by gemini-code-assist!

---
 bin/makefile-cygwin.x86_64-sdl |  2 +-
 bin/makefile-wsl1.aarch64-sdl  |  4 ++--
 bin/makefile-wsl1.x86_64-sdl   | 27 ---------------------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/bin/makefile-cygwin.x86_64-sdl b/bin/makefile-cygwin.x86_64-sdl
index 6538071..28531eb 100644
--- a/bin/makefile-cygwin.x86_64-sdl
+++ b/bin/makefile-cygwin.x86_64-sdl
@@ -15,7 +15,7 @@ XFLAGS = -DSDL=2
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
+DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
 
 LDFLAGS = -lm -L/usr/local/lib -lSDL2
 #
diff --git a/bin/makefile-wsl1.aarch64-sdl b/bin/makefile-wsl1.aarch64-sdl
index 94b719c..f3ce3ca 100644
--- a/bin/makefile-wsl1.aarch64-sdl
+++ b/bin/makefile-wsl1.aarch64-sdl
@@ -1,4 +1,4 @@
-# Options for Linux, ARM64 and SDL
+# Options for Windows System for Linux v1, ARM64 and SDL
 
 CC = gcc $(GCC_CFLAGS)
 #CC = clang $(CLANG_CFLAGS)
@@ -15,7 +15,7 @@ SDLFLAGS = -DSDL=2
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
 
 LDFLAGS = -lSDL2 -lm
 LDELDFLAGS =
diff --git a/bin/makefile-wsl1.x86_64-sdl b/bin/makefile-wsl1.x86_64-sdl
index 765b562..ec16b95 100644
--- a/bin/makefile-wsl1.x86_64-sdl
+++ b/bin/makefile-wsl1.x86_64-sdl
@@ -1,32 +1,5 @@
 # Options for Windows System for Linux v1, Intel x86_64 and SDL
 
-CC = gcc $(GCC_CFLAGS)
-#CC = clang $(CLANG_CFLAGS)
-
-XFILES = $(OBJECTDIR)xmkicon.o \
-	$(OBJECTDIR)xbbt.o \
-	$(OBJECTDIR)dspif.o \
-	$(OBJECTDIR)xinit.o \
-	$(OBJECTDIR)xscroll.o \
-	$(OBJECTDIR)xcursor.o \
-	$(OBJECTDIR)xlspwin.o \
-	$(OBJECTDIR)xrdopt.o \
-	$(OBJECTDIR)xwinman.o
-
-XFLAGS = -DXWINDOW
-
-# OPTFLAGS is normally -O2.
-OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
-
-LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
-LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
-
-OBJECTDIR = ../$(RELEASENAME)/
-
-default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
-# Options for Linux, Intel x86_64 and SDL
-
 CC = gcc -m64 $(GCC_CFLAGS)
 # CC = clang -m64 $(CLANG_CFLAGS)