Skip to content
Snippets Groups Projects
Commit 3f56af92 authored by aacuevas's avatar aacuevas
Browse files

Windows.h include not needed with juce 2 

With new jucer, windows.h is not only unnecesary, but can cause conflicts with some definitions.
Also, OpenGL.h includes disabled, as it's no longer needed and it, by itself, needs windows.h
parent 0f906f8e
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 60 deletions
Source/AccessClass.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#ifndef __ACCESSCLASS_H_CE1DC2DE__
#define __ACCESSCLASS_H_CE1DC2DE__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../JuceLibraryCode/JuceHeader.h"
class UIComponent;
......
Source/Audio/AudioComponent.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#ifndef __AUDIOCOMPONENT_H_D97C73CF__
#define __AUDIOCOMPONENT_H_D97C73CF__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../JuceLibraryCode/JuceHeader.h"
/**
......
Source/Main.cpp
+ 1
− 1
View file @ 3f56af92
......@@ -77,7 +77,7 @@ public:
StringArray parameters;
parameters.addTokens(commandLine," ","\"");
#ifdef WIN32
glWinInit();
//glWinInit();
if (parameters.contains("--console",true)) {
if (AllocConsole())
......
Source/MainWindow.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#ifndef __MAINWINDOW_H_BA75E17__
#define __MAINWINDOW_H_BA75E17__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../JuceLibraryCode/JuceHeader.h"
#include "UI/UIComponent.h"
#include "Audio/AudioComponent.h"
......
Source/Processors/ArduinoOutput.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#ifndef __ARDUINOOUTPUT_H_F7BDA585__
#define __ARDUINOOUTPUT_H_F7BDA585__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../JuceLibraryCode/JuceHeader.h"
#include "Editors/ArduinoOutputEditor.h"
......
Source/Processors/AudioNode.h
+ 0
− 3
View file @ 3f56af92
......@@ -25,9 +25,6 @@
#define __AUDIONODE_H_AF61F3C5__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../JuceLibraryCode/JuceHeader.h"
#include <stdio.h>
......
Source/Processors/AudioResamplingNode.h
+ 0
− 3
View file @ 3f56af92
......@@ -26,9 +26,6 @@
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../JuceLibraryCode/JuceHeader.h"
#include "../Dsp/Dsp.h"
#include "GenericProcessor.h"
......
Source/Processors/Channel.h
+ 0
− 4
View file @ 3f56af92
......@@ -25,10 +25,6 @@
#define __CHANNEL_H_DABDFE3F__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../JuceLibraryCode/JuceHeader.h"
#include "GenericProcessor.h"
......
Source/Processors/DataThreads/DataBuffer.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#ifndef __DATABUFFER_H_11C6C591__
#define __DATABUFFER_H_11C6C591__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
/**
......
Source/Processors/DataThreads/DataThread.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#ifndef __DATATHREAD_H_C454F4DB__
#define __DATATHREAD_H_C454F4DB__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
#include <stdio.h>
#include "DataBuffer.h"
......
Source/Processors/DataThreads/FPGAThread.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#ifndef __FPGATHREAD_H_FBB22A45__
#define __FPGATHREAD_H_FBB22A45__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
#include <stdio.h>
......
Source/Processors/DataThreads/FileReaderThread.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#ifndef __FILEREADERTHREAD_H_82594504__
#define __FILEREADERTHREAD_H_82594504__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
#include <stdio.h>
......
Source/Processors/DataThreads/IntanThread.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#ifndef __INTANTHREAD_H_D9135C03__
#define __INTANTHREAD_H_D9135C03__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
#include <ftdi.h>
#include <stdio.h>
......
Source/Processors/DataThreads/RHD2000Thread.h
+ 0
− 3
View file @ 3f56af92
......@@ -26,9 +26,6 @@
#define __RHD2000THREAD_H_2C4CBD67__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
#include <stdio.h>
......
Source/Processors/Editors/ArduinoOutputEditor.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#ifndef __ARDUINOOUTPUTEDITOR_H_28EB4CC9__
#define __ARDUINOOUTPUTEDITOR_H_28EB4CC9__
#ifdef _WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
#include "GenericEditor.h"
......
Source/Processors/Editors/AudioEditor.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#define __AUDIOEDITOR_H_9D6F1FC3__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
#include "../AudioNode.h"
#include <stdio.h>
......
Source/Processors/Editors/ChannelSelector.h
+ 0
− 3
View file @ 3f56af92
......@@ -24,9 +24,6 @@
#ifndef __CHANNELSELECTOR_H_68124E35__
#define __CHANNELSELECTOR_H_68124E35__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
#include "GenericEditor.h"
#include "../../AccessClass.h"
......
Source/Processors/Editors/EventNodeEditor.h
+ 0
− 3
View file @ 3f56af92
......@@ -25,9 +25,6 @@
#define __EVENTNODEEDITOR_H_A681BEBC__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
#include "GenericEditor.h"
......
Source/Processors/Editors/FPGAOutputEditor.h
+ 0
− 4
View file @ 3f56af92
......@@ -24,10 +24,6 @@
#ifndef __FPGAOUTPUTEDITOR_H_5A646CD3__
#define __FPGAOUTPUTEDITOR_H_5A646CD3__
#ifdef _WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
#include "GenericEditor.h"
#include "ImageIcon.h"
......
Source/Processors/Editors/FilterEditor.h
+ 0
− 3
View file @ 3f56af92
......@@ -25,9 +25,6 @@
#define __FILTEREDITOR_H_969BDB5__
#ifdef WIN32
#include <Windows.h>
#endif
#include "../../../JuceLibraryCode/JuceHeader.h"
#include "GenericEditor.h"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment