@@ -204,9 +204,9 @@ XRANDR_CFLAGS = $(XRANDR_DEFINE) $(XRANDR_INCDIR)
204204XRANDR_LIBS := $(shell pkg-config --libs xrandr 2>/dev/null || echo -lXrandr)
205205
206206# Flags to enable GDI32 display (Windows native).
207- GDI32_DEFINE = -mwindows
207+ GDI32_DEFINE =
208208GDI32_INCDIR =
209- GDI32_CFLAGS = $(GDI32_DEFINE ) $(GDI32_INCDIR )
209+ GDI32_CFLAGS = $(GDI32_DEFINE ) $(GDI32_INCDIR ) -mwindows
210210GDI32_LIBS = -lgdi32
211211
212212# Flags to enable SDL3 display.
@@ -430,12 +430,14 @@ all
430430mmacos :
431431 @$(MAKE ) --no-print-directory \
432432"CONF_CFLAGS = $(ANSI_CFLAGS ) $(NODISPLAY_CFLAGS ) $(OPT_CFLAGS ) " \
433+ "STRIP_EXE=true" \
433434all
434435
435436Mmacos :
436437 @$(MAKE ) --no-print-directory \
437438"CONF_CFLAGS = $(OPT_CFLAGS ) $(VT100_CFLAGS ) $(X11_CFLAGS ) $(TIFF_CFLAGS ) $(HEIF_CFLAGS ) $(MINC2_CFLAGS ) $(OPENEXR_CFLAGS ) $(PNG_CFLAGS ) $(JPEG_CFLAGS ) $(ZLIB_CFLAGS ) $(OPENCV_CFLAGS ) $(MAGICK_CFLAGS ) $(FFTW3_CFLAGS ) " \
438439"CONF_LIBS = $(X11_LIBS ) $(TIFF_LIBS ) $(HEIF_LIBS ) $(MINC2_LIBS ) $(OPENEXR_LIBS ) $(PNG_LIBS ) $(JPEG_LIBS ) $(ZLIB_LIBS ) $(OPENCV_LIBS ) $(MAGICK_LIBS ) $(FFTW3_LIBS ) " \
440+ "STRIP_EXE=true" \
439441all $(EXTRA_FILES )
440442
441443# Windows targets, with GDI32 display.
@@ -447,13 +449,13 @@ all
447449
448450dwindows :
449451 @$(MAKE ) --no-print-directory \
450- "CONF_CFLAGS = $(DEBUG_CFLAGS ) " \
452+ "CONF_CFLAGS = $(DEBUG_CFLAGS ) $( GDI32_CFLAGS ) " \
451453"CONF_LIBS = $(GDI32_LIBS ) " \
452454all
453455
454456owindows :
455457 @$(MAKE ) --no-print-directory \
456- "CONF_CFLAGS = $(OPT_CFLAGS ) " \
458+ "CONF_CFLAGS = $(OPT_CFLAGS ) $( GDI32_CFLAGS ) " \
457459"CONF_LIBS = $(GDI32_LIBS ) " \
458460"STRIP_EXE=true" \
459461all
466468
467469Mwindows :
468470 @$(MAKE ) --no-print-directory \
469- "CONF_CFLAGS = $(OPT_CFLAGS ) $(TIFF_CFLAGS ) $(HEIF_CFLAGS ) $(PNG_CFLAGS ) $(JPEG_CFLAGS ) $(ZLIB_CFLAGS ) $(OPENCV_CFLAGS ) $(FFTW3_CFLAGS ) " \
471+ "CONF_CFLAGS = $(OPT_CFLAGS ) $(GDI32_CFLAGS ) $( TIFF_CFLAGS ) $(HEIF_CFLAGS ) $(PNG_CFLAGS ) $(JPEG_CFLAGS ) $(ZLIB_CFLAGS ) $(OPENCV_CFLAGS ) $(FFTW3_CFLAGS ) " \
470472"CONF_LIBS = $(GDI32_LIBS ) $(TIFF_LIBS ) $(HEIF_LIBS ) $(PNG_LIBS ) $(JPEG_LIBS ) $(ZLIB_LIBS ) $(OPENCV_LIBS ) $(FFTW3_LIBS ) " \
471473"STRIP_EXE=true" \
472474all $(EXTRA_FILES )
0 commit comments