Skip to content

Commit 7dd3c90

Browse files
committed
Fix up various makefile-wsl (and -cygwin) errors pointed out by gemini-code-assist!
1 parent 389ecf7 commit 7dd3c90

File tree

3 files changed

+3
-30
lines changed

3 files changed

+3
-30
lines changed

bin/makefile-cygwin.x86_64-sdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ XFLAGS = -DSDL=2
1515

1616
# OPTFLAGS is normally -O2.
1717
OPTFLAGS = -O2 -g3
18-
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
18+
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
1919

2020
LDFLAGS = -lm -L/usr/local/lib -lSDL2
2121
#

bin/makefile-wsl1.aarch64-sdl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Options for Linux, ARM64 and SDL
1+
# Options for Windows System for Linux v1, ARM64 and SDL
22

33
CC = gcc $(GCC_CFLAGS)
44
#CC = clang $(CLANG_CFLAGS)
@@ -15,7 +15,7 @@ SDLFLAGS = -DSDL=2
1515

1616
# OPTFLAGS is normally -O2.
1717
OPTFLAGS = -O2 -g3
18-
DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
18+
DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
1919

2020
LDFLAGS = -lSDL2 -lm
2121
LDELDFLAGS =

bin/makefile-wsl1.x86_64-sdl

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,5 @@
11
# Options for Windows System for Linux v1, Intel x86_64 and SDL
22

3-
CC = gcc $(GCC_CFLAGS)
4-
#CC = clang $(CLANG_CFLAGS)
5-
6-
XFILES = $(OBJECTDIR)xmkicon.o \
7-
$(OBJECTDIR)xbbt.o \
8-
$(OBJECTDIR)dspif.o \
9-
$(OBJECTDIR)xinit.o \
10-
$(OBJECTDIR)xscroll.o \
11-
$(OBJECTDIR)xcursor.o \
12-
$(OBJECTDIR)xlspwin.o \
13-
$(OBJECTDIR)xrdopt.o \
14-
$(OBJECTDIR)xwinman.o
15-
16-
XFLAGS = -DXWINDOW
17-
18-
# OPTFLAGS is normally -O2.
19-
OPTFLAGS = -O2 -g3
20-
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
21-
22-
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
23-
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
24-
25-
OBJECTDIR = ../$(RELEASENAME)/
26-
27-
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
28-
# Options for Linux, Intel x86_64 and SDL
29-
303
CC = gcc -m64 $(GCC_CFLAGS)
314
# CC = clang -m64 $(CLANG_CFLAGS)
325

0 commit comments

Comments
 (0)