eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

moved fix with "NOMINMAX" in the project file

Browse source
This commit is contained in:
Volker Fischer 2013-01-13 14:20:53 +00:00
parent 0b54e813ff
commit 2b5297fcdc
3 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
llcon.pro
View file

@ -14,6 +14,7 @@ DEFINES += USE_ALLOCA \
win32 { win32 {
DEFINES -= UNICODE DEFINES -= UNICODE
DEFINES += NOMINMAX # solves a compiler error in qdatetime.h (Qt5)
HEADERS += windows/sound.h HEADERS += windows/sound.h
SOURCES += windows/sound.cpp \ SOURCES += windows/sound.cpp \
windows/ASIOSDK2/common/asio.cpp \ windows/ASIOSDK2/common/asio.cpp \

1
src/util.h
View file

@ -40,7 +40,6 @@
#include "global.h" #include "global.h"
using namespace std; // because of the library: "vector" using namespace std; // because of the library: "vector"
#ifdef _WIN32 #ifdef _WIN32
# define NOMINMAX // solves a compiler error in qdatetime.h (Qt5)
# include <windows.h> # include <windows.h>
# include <mmsystem.h> # include <mmsystem.h>
#endif #endif

1
windows/sound.h
View file

@ -25,7 +25,6 @@
#if !defined ( _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_ ) #if !defined ( _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_ )
#define _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_ #define _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_
#define NOMINMAX // solves a compiler error in qdatetime.h (Qt5)
#include <windows.h> #include <windows.h>
#include <QMutex> #include <QMutex>
#include <QMessageBox> #include <QMessageBox>