From ed321e2df54d20e65fffa1532275ae6bfcb0b82f Mon Sep 17 00:00:00 2001 From: wrenczes Date: Mon, 6 Dec 2010 07:44:16 +0000 Subject: [PATCH] Linux specific changes to allow linking against Boost::threads. Not used by the current build. Also turned off 'unused' warnings in QTCreator to match more closely the warnings that we pay attention to in the psp build. --- projects/mtg/Makefile | 4 ++-- projects/mtg/wagic.pro | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile index 5c335a0c8..20ab3ba5b 100644 --- a/projects/mtg/Makefile +++ b/projects/mtg/Makefile @@ -40,8 +40,8 @@ CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1 else OBJS += objs/TestSuiteAI.o INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I../../Boost -LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib -LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 $(FMOD) +LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib -L../../Boost/lib +LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 -lboost_thread $(FMOD) CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1 ASFLAGS = $(CXXFLAGS) diff --git a/projects/mtg/wagic.pro b/projects/mtg/wagic.pro index 1cc311c8b..aad274e55 100644 --- a/projects/mtg/wagic.pro +++ b/projects/mtg/wagic.pro @@ -8,6 +8,7 @@ QT += core gui opengl VERSION = 0.13.0 TARGET = wagic TEMPLATE = app +QMAKE_CXXFLAGS += -Wno-unused-parameter windows:DEFINES += WIN32 windows:DEFINES += _CRT_SECURE_NO_WARNINGS windows:DEFINES += FORCE_GL2 @@ -21,12 +22,13 @@ windows:INCLUDEPATH += ../../JGE/Dependencies/include unix:INCLUDEPATH += /usr/include/GL unix:INCLUDEPATH += /usr/include/freetype2 INCLUDEPATH += ../../JGE/include +INCLUDEPATH += ../../Boost INCLUDEPATH += include OBJECTS_DIR = objs MOC_DIR = objs DESTDIR = bin -unix:LIBS += -ljpeg -lgif -lpng12 +unix:LIBS += -ljpeg -lgif -lpng12 -lboost_thread -L../../Boost/lib windows:LIBS += -L../../JGE/Dependencies/lib -llibjpeg-static-mt-debug -lgiflib -llibpng -lfmodvc # MGT