Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enabled c++0x flag, use OpenAL audio backend by default.

This commit is contained in:
Sergey Shambir 2013-06-03 09:10:34 +04:00
parent 984ed75b9a
commit f5b9b4580c
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos2dx/proj.linux/cocos2dx.prf
View File

@ -2,9 +2,10 @@
# Do not include this file in your project: see cocos2dx.pri.
################################################################################
# (Set variables in global scope).
linux {
# Use OpenAL in default QtCreator project.
isEmpty(COCOS2D_USE_FMOD):COCOS2D_USE_FMOD=0
# Variables used when building libraries.
CC_LIBRARY_DIR = $$PWD/../../lib/linux/release
CC_MAKE_FLAGS = -s
@ -16,6 +17,9 @@ linux {
contains(COCOS2D_MODULES,box2d) {
CC_MAKE_FLAGS += USE_BOX2D=1
}
!equals(COCOS2D_USE_FMOD, 1) {
CC_MAKE_FLAGS += OPENAL=1
}
# We will compile cocos2d shared library on demand using Makefile.
build_cocos2d.name = Build cocos2d shared library

8
cocos2dx/proj.linux/cocos2dx.pri
View File

@ -10,6 +10,11 @@
# COCOS2D_MODULES += chipmunk
# note: you cannot include both box2d and chipmunk.
#
# By default, QtCreator project will use OpenAL audio backend (because FMOD is
# free only for non-commercial use). If you are legal FMOD user, set variable
# COCOS2D_USE_FMOD to use FMOD audio backend:
# COCOS2D_USE_FMOD = 1
#
################################################################################
INCLUDEPATH += $$PWD/../
@ -22,7 +27,8 @@ INCLUDEPATH += $$PWD/../kazmath/include
# Use equivalents of -Wno-overloaded-virtual -Wno-unused-parameter.
QMAKE_CXXFLAGS_WARN_ON += /wd4263 /wd4100
} else {
QMAKE_CXXFLAGS_WARN_ON += -Wno-ignored-qualifiers -Wno-overloaded-virtual -Wno-unused-parameter
QMAKE_CXXFLAGS_WARN_ON += -Wno-ignored-qualifiers -Wno-overloaded-virtual -Wno-unused-parameter -Wno-unused-function
QMAKE_CXXFLAGS += -std=c++0x
}
include($$PWD/cocos2dx.prf)