mirror of
https://github.com/mapmapteam/mapmap.git
synced 2026-06-16 12:33:19 +02:00
Fixed to make it work under OSX
This commit is contained in:
@@ -24,8 +24,13 @@
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
#include <tr1/memory>
|
||||
#if __APPLE__
|
||||
#include <OpenGL/gl.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#endif
|
||||
|
||||
#include <tr1/memory>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
@@ -25,7 +25,13 @@
|
||||
#include <QtGlobal>
|
||||
#include <QtOpenGL>
|
||||
#include <string>
|
||||
|
||||
#if __APPLE__
|
||||
#include <OpenGL/gl.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#endif
|
||||
|
||||
#include <tr1/memory>
|
||||
|
||||
/**
|
||||
|
||||
@@ -20,7 +20,11 @@
|
||||
#ifndef UTIL_H_
|
||||
#define UTIL_H_
|
||||
|
||||
#if __APPLE__
|
||||
#include <OpenGL/gl.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#endif
|
||||
|
||||
#include "Shape.h"
|
||||
#include "Paint.h"
|
||||
|
||||
+6
-1
@@ -3,10 +3,15 @@ TEMPLATE = app
|
||||
HEADERS = MainWindow.h Util.h MapperGLCanvas.h SourceGLCanvas.h DestinationGLCanvas.h Mapper.h Mapping.h Shape.h Paint.h MappingManager.h
|
||||
SOURCES = main.cpp MainWindow.cpp Util.cpp Mapper.cpp MapperGLCanvas.cpp SourceGLCanvas.cpp DestinationGLCanvas.cpp MappingManager.cpp
|
||||
QT += gui opengl
|
||||
LIBS += -lglut -lGLU
|
||||
RESOURCES = libremapping.qrc
|
||||
|
||||
docs.depends = $(HEADERS) $(SOURCES)
|
||||
docs.commands = (cat Doxyfile; echo "INPUT = $?") | doxygen -
|
||||
QMAKE_EXTRA_TARGETS += docs
|
||||
|
||||
# mac
|
||||
macx:LIBS += -framework OpenGL -framework GLUT
|
||||
macx:QMAKE_CXXFLAGS += -D__MACOSX_CORE__
|
||||
|
||||
# not mac
|
||||
!macx:LIBS += -lglut -lGLU
|
||||
|
||||
Reference in New Issue
Block a user