From ba3b608c179262d8525188abcc45b5c768f88cf4 Mon Sep 17 00:00:00 2001 From: CNLohr Date: Mon, 11 May 2020 18:15:10 -0700 Subject: [PATCH] Fix Windows compile. --- colorchord2/DisplayNetwork.c | 2 +- colorchord2/cnfa | 2 +- colorchord2/windows/compile.bat | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/colorchord2/DisplayNetwork.c b/colorchord2/DisplayNetwork.c index a2eb6d4..9f8cc62 100644 --- a/colorchord2/DisplayNetwork.c +++ b/colorchord2/DisplayNetwork.c @@ -5,7 +5,6 @@ #include #include "parameters.h" #include -#include #include #include #include "color.h" @@ -18,6 +17,7 @@ #endif #define MSG_NOSIGNAL 0 #else +#include #define closesocket( x ) close( x ) #include #include diff --git a/colorchord2/cnfa b/colorchord2/cnfa index c474fb4..de9d3d4 160000 --- a/colorchord2/cnfa +++ b/colorchord2/cnfa @@ -1 +1 @@ -Subproject commit c474fb4c0a81a3d460125ce275c5dc7d96eba0b5 +Subproject commit de9d3d45979bd9c34f9f7fa54524ed726473894d diff --git a/colorchord2/windows/compile.bat b/colorchord2/windows/compile.bat index a29f643..79c0915 100644 --- a/colorchord2/windows/compile.bat +++ b/colorchord2/windows/compile.bat @@ -1,9 +1,9 @@ @echo off echo Unzip http://download.savannah.gnu.org/releases/tinycc/tcc-0.9.27-win64-bin.zip to C:\tcc echo Don't worry. It includes the i386 compiler in the win64 build. -set CFLAGS=-v -DHIDAPI -DWINDOWS -DWIN32 -DTCC -DRUNTIME_SYMNUM -Os -Itccinc -DINCLUDING_EMBEDDED -I.. -I. -I../../embeddedcommon -rdynamic -g +set CFLAGS=-v -DHIDAPI -DWINDOWS -DWIN32 -DTCC -DRUNTIME_SYMNUM -Os -Itccinc -DINCLUDING_EMBEDDED -I../rawdraw -I../cnfa -I.. -I. -I../../embeddedcommon -rdynamic -g set LDFLAGS=-lkernel32 -lgdi32 -luser32 -lsetupapi -ldbghelp -lws2_32 -set SOURCES=..\chash.c ..\color.c ..\configs.c ..\decompose.c ..\dft.c ..\DisplayNetwork.c ..\DisplayArray.c ..\DisplayHIDAPI.c ..\DisplayOUTDriver.c ..\DisplayPie.c ..\DrawFunctions.c ..\filter.c ..\hidapi.c ..\hook.c ..\main.c ..\os_generic.c ..\outdrivers.c ..\OutputCells.c ..\OutputLinear.c ..\OutputProminent.c ..\OutputVoronoi.c ..\parameters.c ..\sound.c ..\sound_win.c ..\sound_null.c ..\util.c ..\WinDriver.c ..\notefinder.c ..\..\embeddedcommon\DFT32.c tcc_stubs.c symbol_enumerator.c +set SOURCES=..\chash.c ..\color.c ..\configs.c ..\decompose.c ..\dft.c ..\DisplayNetwork.c ..\DisplayArray.c ..\DisplayHIDAPI.c ..\DisplayOUTDriver.c ..\DisplayPie.c ..\filter.c ..\hidapi.c ..\hook.c ..\main.c ..\outdrivers.c ..\OutputCells.c ..\OutputLinear.c ..\OutputProminent.c ..\OutputVoronoi.c ..\parameters.c ..\util.c ..\notefinder.c ..\..\embeddedcommon\DFT32.c tcc_stubs.c symbol_enumerator.c set ARCH_SPECIFIC=-L32 C:\windows\system32\winmm.dll set CC=C:\tcc\i386-win32-tcc.exe rem set CC=C:\tcc\x86_64-win32-tcc.exe