From 6dab01fb355870e12ef38db479fa01cc0127c30d Mon Sep 17 00:00:00 2001 From: CNLohr Date: Sat, 12 Nov 2022 13:57:47 -0800 Subject: [PATCH] Fix build on unusual version of mingw. --- colorchord2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/colorchord2/Makefile b/colorchord2/Makefile index 08ef806..d2f3487 100644 --- a/colorchord2/Makefile +++ b/colorchord2/Makefile @@ -2,10 +2,10 @@ all : colorchord colorchord-opengl OUTS := OutputVoronoi.o DisplayArray.o OutputLinear.o DisplayPie.o DisplayNetwork.o DisplayUSB2812.o DisplayDMX.o OutputProminent.o RecorderPlugin.o DisplayHIDAPI.o hidapi.o OutputCells.o DisplaySHM.o DisplayFileWrite.o DisplayRadialPoles.o -WINGCC:= i686-w64-mingw32-gcc +WINGCC?=i686-w64-mingw32-gcc WINGCCFLAGS:= -g -DICACHE_FLASH_ATTR= -I../embeddedcommon -Icnfa -Irawdraw -I. -O1 #-O2 -Wl,--relax -Wl,--gc-sections -ffunction-sections -fdata-sections -WINLDFLAGS:=-lwinmm -lgdi32 -lws2_32 -lsetupapi +WINLDFLAGS:=-lwinmm -lgdi32 -lws2_32 -lsetupapi -lole32 -lavrt #CFLAGS:=-g -O1 -flto -Wall -ffast-math -I../embeddedcommon -I. -Icnfa -Irawdraw -DICACHE_FLASH_ATTR= CFLAGS:=-g -O2 -Wall -ffast-math -I../embeddedcommon -I. -Icnfa -Irawdraw -DICACHE_FLASH_ATTR= @@ -35,7 +35,7 @@ colorchord-opengl : $(OBJS) $(CC) -o $@ $^ -DCNFGOGL $(EXTRALIBS) $(OPENGLLIBS) $(RAWDRAWLIBS) colorchord.exe : main.c dft.c decompose.c filter.c color.c notefinder.c util.c outdrivers.c parameters.c chash.c OutputVoronoi.c OutputProminent.c DisplayArray.c OutputLinear.c DisplayPie.c DisplayNetwork.c hook.c RecorderPlugin.c ../embeddedcommon/DFT32.c OutputCells.c configs.c hidapi.c DisplayHIDAPI.c - $(WINGCC) $(WINGCCFLAGS) -o $@ $^ $(WINLDFLAGS) + $(WINGCC) $(WINGCCFLAGS) -o $@ $^ $(o) $(WINLDFLAGS) clean :