From a48213453a6966c3db1134afc073a5fae99b5f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Sat, 9 Nov 2013 18:56:56 +0100 Subject: [PATCH] Ajout de common.pri --- src/basics/basics.pro | 2 ++ src/common.pri | 4 ++++ src/controlling/controlling.pro | 2 +- src/definition/definition.pro | 2 ++ src/editing/editing.pro | 2 +- src/render/opengl/opengl.pro | 2 ++ src/render/software/software.pro | 2 ++ src/rendering/rendering.pro | 3 ++- src/system/system.pro | 3 ++- 9 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 src/common.pri diff --git a/src/basics/basics.pro b/src/basics/basics.pro index 3870692..0e2526b 100644 --- a/src/basics/basics.pro +++ b/src/basics/basics.pro @@ -11,6 +11,8 @@ TEMPLATE = lib DEFINES += BASICS_LIBRARY +include(../common.pri) + SOURCES += \ NoiseGenerator.cpp \ NoiseFunctionNaive.cpp \ diff --git a/src/common.pri b/src/common.pri new file mode 100644 index 0000000..b821694 --- /dev/null +++ b/src/common.pri @@ -0,0 +1,4 @@ +#QMAKE_CXXFLAGS = -std=c++11 -stdlib=libc++ +#QMAKE_LFLAGS = -std=c++11 -stdlib=libc++ +CONFIG(release, debug|release): DEFINES += NDEBUG + diff --git a/src/controlling/controlling.pro b/src/controlling/controlling.pro index f1ffd65..e138638 100644 --- a/src/controlling/controlling.pro +++ b/src/controlling/controlling.pro @@ -6,7 +6,7 @@ TARGET = paysages-cli INCLUDEPATH += $$PWD/.. -CONFIG(release, debug|release): DEFINES += NDEBUG +include(../common.pri) SOURCES += \ main.cpp diff --git a/src/definition/definition.pro b/src/definition/definition.pro index 39c6b65..dbf85a5 100644 --- a/src/definition/definition.pro +++ b/src/definition/definition.pro @@ -11,6 +11,8 @@ TEMPLATE = lib DEFINES += DEFINITION_LIBRARY +include(../common.pri) + SOURCES += \ BaseDefinition.cpp \ Layers.cpp \ diff --git a/src/editing/editing.pro b/src/editing/editing.pro index 10f3ca9..a8b4ce0 100644 --- a/src/editing/editing.pro +++ b/src/editing/editing.pro @@ -7,7 +7,7 @@ TARGET = paysages-gui unix:LIBS += -lGLU -CONFIG(release, debug|release): DEFINES += NDEBUG +include(../common.pri) INCLUDEPATH += $$PWD/.. diff --git a/src/render/opengl/opengl.pro b/src/render/opengl/opengl.pro index 5557b2d..59896d6 100644 --- a/src/render/opengl/opengl.pro +++ b/src/render/opengl/opengl.pro @@ -11,6 +11,8 @@ TEMPLATE = lib DEFINES += OPENGL_LIBRARY +include(../../common.pri) + SOURCES += \ OpenGLRenderer.cpp \ BaseExplorerChunk.cpp \ diff --git a/src/render/software/software.pro b/src/render/software/software.pro index 67c3c01..4afad15 100644 --- a/src/render/software/software.pro +++ b/src/render/software/software.pro @@ -11,6 +11,8 @@ TEMPLATE = lib DEFINES += SOFTWARE_LIBRARY +include(../../common.pri) + SOURCES += SoftwareRenderer.cpp \ global/FluidMediumTraversal.cpp diff --git a/src/rendering/rendering.pro b/src/rendering/rendering.pro index 7059479..e9e7343 100644 --- a/src/rendering/rendering.pro +++ b/src/rendering/rendering.pro @@ -5,7 +5,8 @@ TEMPLATE = lib TARGET = paysages_rendering DEFINES += RENDERING_LIBRARY -CONFIG(release, debug|release): DEFINES += NDEBUG + +include(../common.pri) INCLUDEPATH += $$PWD/.. diff --git a/src/system/system.pro b/src/system/system.pro index a23a575..09a3116 100644 --- a/src/system/system.pro +++ b/src/system/system.pro @@ -10,7 +10,8 @@ TEMPLATE = lib TARGET = paysages_system DEFINES += SYSTEM_LIBRARY -CONFIG(release, debug|release): DEFINES += NDEBUG + +include(../common.pri) SOURCES += \ PictureFile.cpp \