Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
wrenczes
2010-12-06 07:44:16 +00:00
parent ffd3b7b074
commit ed321e2df5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/Makefile
+2 -2
View File
@@ -40,8 +40,8 @@ CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1
else else
OBJS += objs/TestSuiteAI.o OBJS += objs/TestSuiteAI.o
INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I../../Boost 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 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 $(FMOD) LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 -lboost_thread $(FMOD)
CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1 CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1
ASFLAGS = $(CXXFLAGS) ASFLAGS = $(CXXFLAGS)
projects/mtg/wagic.pro
+3 -1
View File
@@ -8,6 +8,7 @@ QT += core gui opengl
VERSION = 0.13.0 VERSION = 0.13.0
TARGET = wagic TARGET = wagic
TEMPLATE = app TEMPLATE = app
QMAKE_CXXFLAGS += -Wno-unused-parameter
windows:DEFINES += WIN32 windows:DEFINES += WIN32
windows:DEFINES += _CRT_SECURE_NO_WARNINGS windows:DEFINES += _CRT_SECURE_NO_WARNINGS
windows:DEFINES += FORCE_GL2 windows:DEFINES += FORCE_GL2
@@ -21,12 +22,13 @@ windows:INCLUDEPATH += ../../JGE/Dependencies/include
unix:INCLUDEPATH += /usr/include/GL unix:INCLUDEPATH += /usr/include/GL
unix:INCLUDEPATH += /usr/include/freetype2 unix:INCLUDEPATH += /usr/include/freetype2
INCLUDEPATH += ../../JGE/include INCLUDEPATH += ../../JGE/include
INCLUDEPATH += ../../Boost
INCLUDEPATH += include INCLUDEPATH += include
OBJECTS_DIR = objs OBJECTS_DIR = objs
MOC_DIR = objs MOC_DIR = objs
DESTDIR = bin 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 windows:LIBS += -L../../JGE/Dependencies/lib -llibjpeg-static-mt-debug -lgiflib -llibpng -lfmodvc
# MGT # MGT