From 4eb0eb8d4a819585acfed05bbc403ff04d187475 Mon Sep 17 00:00:00 2001 From: Sam Ellicott Date: Wed, 20 May 2020 23:59:59 -0400 Subject: [PATCH] Misc fixes: -Make the submodule match upstream. -Update Windows makefile to work. --- .gitmodules | 2 +- colorchord2/windows/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0803dc3..ae541d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/cntools/rawdraw [submodule "colorchord2/cnfa"] path = colorchord2/cnfa - url = https://github.com/CaiB/cnfa + url = https://github.com/cnlohr/cnfa [submodule "colorchord2/android/rawdrawandroid"] path = colorchord2/android/rawdrawandroid url = https://github.com/cnlohr/rawdrawandroid diff --git a/colorchord2/windows/Makefile b/colorchord2/windows/Makefile index 0701174..bba0cb0 100644 --- a/colorchord2/windows/Makefile +++ b/colorchord2/windows/Makefile @@ -1,4 +1,4 @@ -all : colorchord.exe +all : ../colorchord.exe 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 @@ -10,15 +10,15 @@ SRCS += ../../embeddedcommon/DFT32.c ../OutputCells.c ../configs.c ../hidapi.c . WINGCC:= clang -fcolor-diagnostics WINGCCFLAGS:= -g -D_CRT_SECURE_NO_WARNINGS -Wno-deprecated-declarations -DICACHE_FLASH_ATTR= -I../../embeddedcommon -I../cnfa -I../rawdraw -I../ -O1 #-O2 -Wl,--relax -Wl,--gc-sections -ffunction-sections -fdata-sections -WINLDFLAGS:=-lwinmm -lgdi32 -lws2_32 -lsetupapi +WINLDFLAGS:=-lwinmm -lgdi32 -lws2_32 -lsetupapi -lkernel32 -luser32 -ldbghelp -lole32 -lmmdevapi -lAvrt RAWDRAWLIBS:=-lX11 -lm -lpthread -lXinerama -lXext LDLIBS:=-lpthread -lasound -lm -lpulse-simple -lpulse -ludev -lrt OBJS:=../main.o ../dft.o ../decompose.o ../filter.o ../color.o ../notefinder.o ../util.o ../outdrivers.o $(OUTS) ../parameters.o ../chash.o ../hook.o ../../embeddedcommon/DFT32.o ../configs.o -colorchord.exe : $(SRCS) +../colorchord.exe : $(SRCS) $(WINGCC) $(WINGCCFLAGS) -o $@ $^ $(WINLDFLAGS) clean : - rm -rf *.o *~ colorchord colorchord.exe embeddedcc $(OBJS) + rm -rf *.o *~ ../colorchord ../colorchord.exe ../embeddedcc $(OBJS)