fruchti/colorchord
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Misc fixes:

Browse source 
-Make the submodule match upstream.
-Update Windows makefile to work.
This commit is contained in:
Sam Ellicott 2020-05-20 23:59:59 -04:00
parent 98623aa299
commit 4eb0eb8d4a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -6,7 +6,7 @@
url = https://github.com/cntools/rawdraw url = https://github.com/cntools/rawdraw
[submodule "colorchord2/cnfa"] [submodule "colorchord2/cnfa"]
path = colorchord2/cnfa path = colorchord2/cnfa
url = https://github.com/CaiB/cnfa url = https://github.com/cnlohr/cnfa
[submodule "colorchord2/android/rawdrawandroid"] [submodule "colorchord2/android/rawdrawandroid"]
path = colorchord2/android/rawdrawandroid path = colorchord2/android/rawdrawandroid
url = https://github.com/cnlohr/rawdrawandroid url = https://github.com/cnlohr/rawdrawandroid

8
colorchord2/windows/Makefile
View file

@ -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 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 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 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 RAWDRAWLIBS:=-lX11 -lm -lpthread -lXinerama -lXext
LDLIBS:=-lpthread -lasound -lm -lpulse-simple -lpulse -ludev -lrt 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 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) $(WINGCC) $(WINGCCFLAGS) -o $@ $^ $(WINLDFLAGS)
clean : clean :
rm -rf *.o *~ colorchord colorchord.exe embeddedcc $(OBJS) rm -rf *.o *~ ../colorchord ../colorchord.exe ../embeddedcc $(OBJS)