Change which macro is used to check for Windows targets
rockbox-gerrit-noreply--- via rockbox-cvs <[email protected]> Sat, 18 Apr 2026 13:43:49 -0400
| Newsgroups | gmane.comp.systems.archos.rockbox.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 1adadc943dc4d804ef02cdfb351da447ddc4ce88 Author: Vencislav Atanasov <[email protected]> Date: Mon Mar 30 19:34:05 2026 +0300 Change which macro is used to check for Windows targets This fixes a false-positive on macOS that was caused by the macro "#define TARGET_OS_WIN32 0" Change-Id: I1fcfb19b5aae4f63f00b9500094d619c4f7eea4b diff --git a/utils/jztool/Makefile b/utils/jztool/Makefile index d1bbae578c..02436d47bc 100644 --- a/utils/jztool/Makefile +++ b/utils/jztool/Makefile @@ -21,7 +21,7 @@ EXTRADEPS := libucl.a libmicrotar.a CPPDEFINES := $(shell echo foo | $(CROSS)$(CC) -dM -E -) -ifeq ($(findstring WIN32,$(CPPDEFINES)),WIN32) +ifeq ($(findstring __WIN32__,$(CPPDEFINES)),__WIN32__) # TODO: support Windows else ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) diff --git a/utils/mks5lboot/Makefile b/utils/mks5lboot/Makefile index 72ea521d5f..5cd4d4f826 100644 --- a/utils/mks5lboot/Makefile +++ b/utils/mks5lboot/Makefile @@ -18,7 +18,7 @@ EXTRADEPS := CPPDEFINES := $(shell echo foo | $(CROSS)$(CC) -dM -E -) -ifeq ($(findstring WIN32,$(CPPDEFINES)),WIN32) +ifeq ($(findstring __WIN32__,$(CPPDEFINES)),__WIN32__) LDOPTS += -lsetupapi # optional libusb support (needed for WinUSB and libusbK drivers) ifeq ($(findstring MINGW,$(CPPDEFINES)),MINGW) -- rockbox-cvs mailing list [email protected] https://lists.haxx.se/mailman/listinfo/rockbox-cvs