Skip to content

Compile on a Mac #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 27, 2015
Merged

Compile on a Mac #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e2f74a
Compile on a Mac
gcoco Jan 14, 2015
e4050c2
Change Q_WS_WIN to Q_OS_WIN for Qt5 compilation
gcoco Jan 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/qwt3d_global.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// Create Qwt3d DLL if QWT3D_DLL is defined (Windows only)
//

#if defined(Q_WS_WIN)
#if defined(Q_OS_WIN)
#if defined(_MSC_VER) /* MSVC Compiler */
#pragma warning(disable: 4251) // dll interface required for stl templates
//pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data
Expand Down Expand Up @@ -42,7 +42,7 @@
#define QWT3D_TEMPLATEDLL
#endif

#else // ! Q_WS_WIN
#else // ! Q_OS_WIN
#undef QWT3D_MAKEDLL /* ignore these for other platforms */
#undef QWT3D_DLL
#undef QWT3D_TEMPLATEDLL
Expand Down
4 changes: 4 additions & 0 deletions include/qwt3d_openglhelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

//#include <qglobal.h>
#include <QtOpenGL/qgl.h>
#ifdef Q_OS_MAC
#include <OpenGL/glu.h>
#else
#include <GL/glu.h>
#endif

namespace Qwt3D
{
Expand Down
2 changes: 1 addition & 1 deletion include/qwt3d_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <string>

#if defined(Q_WS_WIN)
#if defined(Q_OS_WIN)
#include <windows.h>
#endif

Expand Down