Changeset 9120:8a42adb86c68 in orange


Ignore:
Timestamp:
10/18/11 23:18:52 (3 years ago)
Author:
matejd <matejd@…>
Branch:
default
Convert:
38980a715c06448ee08ba5dd372185fcbd9a9a89
Message:

Added additional include and define, orangeqt didn't compile under VS10

Location:
source/orangeqt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • source/orangeqt/canvas3d.h

    r9080 r9120  
    1111#include <QtCore/QMap> 
    1212#include <QtCore/QList> 
     13 
     14#ifdef _WIN32 
     15#define NOMINMAX // Avoiding clashing with std::numeric_limits 
     16#include <windows.h> // Errors in gl.h when not included (VS10) 
     17#endif 
    1318 
    1419#ifdef __APPLE__ 
  • source/orangeqt/glextensions.h

    r9080 r9120  
    33 
    44#define BUFFER_OFFSET(i) ((char *)NULL + (i)) 
     5 
     6#ifdef _WIN32 
     7#define NOMINMAX // Avoiding clashing with std::numeric_limits 
     8#include <windows.h> // Errors in gl.h when not included (VS10) 
     9#endif 
    510 
    611#ifdef __APPLE__ // Apple OpenGL framework 
     
    1015#endif //__APPLE__ 
    1116 
    12 #ifdef _WIN32 // Should be defined by most Windows compilers 
     17#ifdef _WIN32 
    1318#include <GL/glext.h> 
    1419#elif defined __APPLE__ // OpenGL framework 
Note: See TracChangeset for help on using the changeset viewer.