All files included in Windows build
- Displays that only work on linux have a compile guard
This commit is contained in:
parent
66a577ef82
commit
744f65defb
|
@ -1,5 +1,10 @@
|
||||||
//Copyright 2015 <>< Charles Lohr under the ColorChord License.
|
//Copyright 2015 <>< Charles Lohr under the ColorChord License.
|
||||||
|
|
||||||
|
// only compile file if we are one a unix system
|
||||||
|
#if defined( WINDOWS ) || defined( USE_WINDOWS ) || defined( WIN32 ) || defined( WIN64 ) || \
|
||||||
|
defined( _WIN32 ) || defined( _WIN64 )
|
||||||
|
#warning Windows does not support the DisplayDMX module
|
||||||
|
#else
|
||||||
#include "outdrivers.h"
|
#include "outdrivers.h"
|
||||||
#include "notefinder.h"
|
#include "notefinder.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -123,5 +128,4 @@ static struct DriverInstances * DisplayDMX()
|
||||||
}
|
}
|
||||||
|
|
||||||
REGISTER_OUT_DRIVER(DisplayDMX);
|
REGISTER_OUT_DRIVER(DisplayDMX);
|
||||||
|
#endif
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
//Copyright 2015 <>< Charles Lohr under the ColorChord License.
|
//Copyright 2015 <>< Charles Lohr under the ColorChord License.
|
||||||
|
|
||||||
|
// only compile file if we are one a unix system
|
||||||
|
#if defined( WINDOWS ) || defined( USE_WINDOWS ) || defined( WIN32 ) || defined( WIN64 ) || \
|
||||||
|
defined( _WIN32 ) || defined( _WIN64 )
|
||||||
|
#warning Windows does not support the DisplayFileWrite module
|
||||||
|
#else
|
||||||
#include "outdrivers.h"
|
#include "outdrivers.h"
|
||||||
#include "notefinder.h"
|
#include "notefinder.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -116,5 +121,4 @@ static struct DriverInstances * DisplayFileWrite(const char * parameters)
|
||||||
}
|
}
|
||||||
|
|
||||||
REGISTER_OUT_DRIVER(DisplayFileWrite);
|
REGISTER_OUT_DRIVER(DisplayFileWrite);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
//Copyright 2015 <>< Charles Lohr under the ColorChord License.
|
//Copyright 2015 <>< Charles Lohr under the ColorChord License.
|
||||||
|
|
||||||
|
// only compile file if we are one a unix system
|
||||||
|
#if defined( WINDOWS ) || defined( USE_WINDOWS ) || defined( WIN32 ) || defined( WIN64 ) || \
|
||||||
|
defined( _WIN32 ) || defined( _WIN64 )
|
||||||
|
#warning Windows does not support the DisplaySHM module
|
||||||
|
#else
|
||||||
#include "outdrivers.h"
|
#include "outdrivers.h"
|
||||||
#include "notefinder.h"
|
#include "notefinder.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -117,5 +122,4 @@ static struct DriverInstances * DisplaySHM(const char * parameters)
|
||||||
}
|
}
|
||||||
|
|
||||||
REGISTER_OUT_DRIVER(DisplaySHM);
|
REGISTER_OUT_DRIVER(DisplaySHM);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
//Copyright 2015 <>< Charles Lohr under the ColorChord License.
|
//Copyright 2015 <>< Charles Lohr under the ColorChord License.
|
||||||
|
|
||||||
|
// only compile file if we are one a unix system
|
||||||
|
#if defined( WINDOWS ) || defined( USE_WINDOWS ) || defined( WIN32 ) || defined( WIN64 ) || \
|
||||||
|
defined( _WIN32 ) || defined( _WIN64 )
|
||||||
|
#warning Windows does not support the DisplayUSB2812 module
|
||||||
|
#else
|
||||||
#include "outdrivers.h"
|
#include "outdrivers.h"
|
||||||
#include "notefinder.h"
|
#include "notefinder.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -166,5 +171,4 @@ static struct DriverInstances * DisplayUSB2812()
|
||||||
}
|
}
|
||||||
|
|
||||||
REGISTER_OUT_DRIVER(DisplayUSB2812);
|
REGISTER_OUT_DRIVER(DisplayUSB2812);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -4,10 +4,12 @@ rem To enable OpenGL rendering use the -DCNFGOGL option
|
||||||
set CCFLAGS=-g -D_CRT_SECURE_NO_WARNINGS -DCNFGOGL
|
set CCFLAGS=-g -D_CRT_SECURE_NO_WARNINGS -DCNFGOGL
|
||||||
set CCIFLAGS=-I../../embeddedcommon -I../cnfa -I../rawdraw -I../ -O2
|
set CCIFLAGS=-I../../embeddedcommon -I../cnfa -I../rawdraw -I../ -O2
|
||||||
set CCLFLAGS=-lwinmm -lgdi32 -lws2_32 -lsetupapi -lkernel32 -luser32 -ldbghelp -lole32 -lmmdevapi -lAvrt -lopengl32
|
set CCLFLAGS=-lwinmm -lgdi32 -lws2_32 -lsetupapi -lkernel32 -luser32 -ldbghelp -lole32 -lmmdevapi -lAvrt -lopengl32
|
||||||
set SOURCES=../main.c ../dft.c ../decompose.c ../filter.c ../color.c ../notefinder.c ../util.c ../outdrivers.c ^
|
set SOURCES=..\main.c ..\chash.c ..\color.c ..\configs.c ..\decompose.c ..\dft.c ..\filter.c ^
|
||||||
../parameters.c ../chash.c ../OutputVoronoi.c ../OutputProminent.c ../DisplayArray.c ^
|
..\outdrivers.c ..\hidapi.c ..\hook.c ..\parameters.c ..\util.c ..\notefinder.c ^
|
||||||
../OutputLinear.c ../DisplayPie.c ../DisplayNetwork.c ../hook.c ../RecorderPlugin.c ^
|
..\..\embeddedcommon\DFT32.c symbol_enumerator.c ^
|
||||||
../../embeddedcommon/DFT32.c ../OutputCells.c ../configs.c ../hidapi.c ../DisplayHIDAPI.c
|
..\DisplayArray.c ..\DisplayDMX.c ..\DisplayFileWrite.c ..\DisplayHIDAPI.c ..\DisplayNetwork.c ^
|
||||||
|
..\DisplayOUTDriver.c ..\DisplayPie.c ..\DisplayRadialPoles.c ..\DisplaySHM.c ..\DisplayUSB2812.c ^
|
||||||
|
..\OutputCells.c ..\OutputLinear.c ..\OutputProminent.c ..\OutputVoronoi.c .
|
||||||
|
|
||||||
@echo on
|
@echo on
|
||||||
%CC% %CCFLAGS% %CCIFLAGS% -o ../colorchord.exe %SOURCES% %CCLFLAGS%
|
%CC% %CCFLAGS% %CCIFLAGS% -o ../colorchord.exe %SOURCES% %CCLFLAGS%
|
||||||
|
|
|
@ -11,8 +11,9 @@ rem lots of source files
|
||||||
set SOURCES=..\main.c ..\chash.c ..\color.c ..\configs.c ..\decompose.c ..\dft.c ..\filter.c ^
|
set SOURCES=..\main.c ..\chash.c ..\color.c ..\configs.c ..\decompose.c ..\dft.c ..\filter.c ^
|
||||||
..\outdrivers.c ..\hidapi.c ..\hook.c ..\parameters.c ..\util.c ..\notefinder.c ^
|
..\outdrivers.c ..\hidapi.c ..\hook.c ..\parameters.c ..\util.c ..\notefinder.c ^
|
||||||
..\..\embeddedcommon\DFT32.c tcc_stubs.c symbol_enumerator.c ^
|
..\..\embeddedcommon\DFT32.c tcc_stubs.c symbol_enumerator.c ^
|
||||||
..\DisplayNetwork.c ..\DisplayArray.c ..\DisplayHIDAPI.c ..\DisplayOUTDriver.c ..\DisplayPie.c ^
|
..\DisplayArray.c ..\DisplayDMX.c ..\DisplayFileWrite.c ..\DisplayHIDAPI.c ..\DisplayNetwork.c ^
|
||||||
..\OutputCells.c ..\OutputLinear.c ..\OutputProminent.c ..\OutputVoronoi.c
|
..\DisplayOUTDriver.c ..\DisplayPie.c ..\DisplayRadialPoles.c ..\DisplaySHM.c ..\DisplayUSB2812.c ^
|
||||||
|
..\OutputCells.c ..\OutputLinear.c ..\OutputProminent.c ..\OutputVoronoi.c .
|
||||||
|
|
||||||
set ARCH_SPECIFIC=-L32 C:\windows\system32\winmm.dll -DWIN32_LEAN_AND_MEAN
|
set ARCH_SPECIFIC=-L32 C:\windows\system32\winmm.dll -DWIN32_LEAN_AND_MEAN
|
||||||
set CC=C:\tcc\tcc.exe
|
set CC=C:\tcc\tcc.exe
|
||||||
|
|
Loading…
Reference in a new issue