From 594b3abf1eceec84faa05513eed1291594502102 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Mon, 6 Dec 2010 22:30:25 +0000 Subject: [PATCH] Qt project fixes on Mac --- JGE/src/Qtmain.cpp | 3 ++- projects/mtg/wagic.pro | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/JGE/src/Qtmain.cpp b/JGE/src/Qtmain.cpp index 6630b729d..453cf4d2f 100644 --- a/JGE/src/Qtmain.cpp +++ b/JGE/src/Qtmain.cpp @@ -293,7 +293,8 @@ void JGEQtRenderer::resizeGL(int width, int height) void JGEQtRenderer::paintGL() { - g_engine->Render(); + if(g_engine) + g_engine->Render(); } void JGEQtRenderer::timerEvent( QTimerEvent* ) diff --git a/projects/mtg/wagic.pro b/projects/mtg/wagic.pro index a4955506b..571c65a64 100644 --- a/projects/mtg/wagic.pro +++ b/projects/mtg/wagic.pro @@ -13,6 +13,7 @@ windows:DEFINES += WIN32 windows:DEFINES += _CRT_SECURE_NO_WARNINGS windows:DEFINES += FORCE_GL2 unix:DEFINES += LINUX +mac:DEFINES += LINUX DEFINES += QT_CONFIG maemo5 { DEFINES += USE_PHONON @@ -21,6 +22,7 @@ QT += phonon dbus windows:INCLUDEPATH += ../../JGE/Dependencies/include unix:INCLUDEPATH += /usr/include/GL #unix:INCLUDEPATH += /usr/include/freetype2 +mac:INCLUDEPATH += /opt/include INCLUDEPATH += ../../JGE/include #INCLUDEPATH += ../../Boost INCLUDEPATH += include @@ -30,6 +32,7 @@ DESTDIR = bin #unix:LIBS += -lboost_thread -L../../Boost/lib windows:LIBS += -L../../JGE/Dependencies/lib -llibjpeg-static-mt-debug -lgiflib -llibpng -lfmodvc +mac:LIBS += -L/opt/lib -lz # MGT SOURCES += \