From 0b29246b33a5a54168f56c1cc1acd9cd8fbf1036 Mon Sep 17 00:00:00 2001 From: ExMix Date: Tue, 24 Sep 2013 19:06:48 +0300 Subject: [PATCH] [drape] pro files --- drape/drape.pro | 38 +++---------------------------- drape/drape_common.pri | 36 +++++++++++++++++++++++++++++ drape/drape_tests/drape_tests.pro | 31 +++++++++++++++++++++++++ omim.pro | 1 + 4 files changed, 71 insertions(+), 35 deletions(-) create mode 100644 drape/drape_common.pri create mode 100644 drape/drape_tests/drape_tests.pro diff --git a/drape/drape.pro b/drape/drape.pro index 6165562e1b..7ecb36d21e 100644 --- a/drape/drape.pro +++ b/drape/drape.pro @@ -13,39 +13,7 @@ DEPENDENCIES = base ROOT_DIR = .. include($$ROOT_DIR/common.pri) -#INCLUDEPATH += $$ROOT_DIR/3party/freetype/include $$ROOT_DIR/3party/agg +DRAPE_DIR = . +include($$DRAPE_DIR/drape_common.pri) -SOURCES += \ - data_buffer.cpp \ - binding_info.cpp \ - batcher.cpp \ - attribute_provider.cpp \ - vertex_array_buffer.cpp \ - uniform_value.cpp \ - texture.cpp \ - shader_reference.cpp \ - index_buffer.cpp \ - gpu_program.cpp \ - gpu_program_manager.cpp \ - glstate.cpp \ - glIncludes.cpp \ - glfunctions.cpp \ - glbuffer.cpp - -HEADERS += \ - data_buffer.hpp \ - binding_info.hpp \ - batcher.hpp \ - attribute_provider.hpp \ - vertex_array_buffer.hpp \ - uniform_value.hpp \ - texture.hpp \ - shader_reference.hpp \ - pointers.hpp \ - index_buffer.hpp \ - gpu_program.hpp \ - gpu_program_manager.hpp \ - glstate.hpp \ - glIncludes.hpp \ - glfunctions.hpp \ - glbuffer.hpp +SOURCES += glfunctions.cpp diff --git a/drape/drape_common.pri b/drape/drape_common.pri new file mode 100644 index 0000000000..18647e8966 --- /dev/null +++ b/drape/drape_common.pri @@ -0,0 +1,36 @@ +SOURCES += \ + $$DRAPE_DIR/data_buffer.cpp \ + $$DRAPE_DIR/binding_info.cpp \ + $$DRAPE_DIR/batcher.cpp \ + $$DRAPE_DIR/attribute_provider.cpp \ + $$DRAPE_DIR/vertex_array_buffer.cpp \ + $$DRAPE_DIR/uniform_value.cpp \ + $$DRAPE_DIR/texture.cpp \ + $$DRAPE_DIR/shader_reference.cpp \ + $$DRAPE_DIR/index_buffer.cpp \ + $$DRAPE_DIR/gpu_program.cpp \ + $$DRAPE_DIR/gpu_program_manager.cpp \ + $$DRAPE_DIR/glconstants.cpp \ + $$DRAPE_DIR/glstate.cpp \ + $$DRAPE_DIR/glbuffer.cpp \ + $$DRAPE_DIR/utils/list_generator.cpp \ + +HEADERS += \ + $$DRAPE_DIR/data_buffer.hpp \ + $$DRAPE_DIR/binding_info.hpp \ + $$DRAPE_DIR/batcher.hpp \ + $$DRAPE_DIR/attribute_provider.hpp \ + $$DRAPE_DIR/vertex_array_buffer.hpp \ + $$DRAPE_DIR/uniform_value.hpp \ + $$DRAPE_DIR/texture.hpp \ + $$DRAPE_DIR/shader_reference.hpp \ + $$DRAPE_DIR/pointers.hpp \ + $$DRAPE_DIR/index_buffer.hpp \ + $$DRAPE_DIR/gpu_program.hpp \ + $$DRAPE_DIR/gpu_program_manager.hpp \ + $$DRAPE_DIR/glstate.hpp \ + $$DRAPE_DIR/glIncludes.hpp \ + $$DRAPE_DIR/glconstants.hpp \ + $$DRAPE_DIR/glfunctions.hpp \ + $$DRAPE_DIR/glbuffer.hpp \ + $$DRAPE_DIR/utils/list_generator.hpp \ diff --git a/drape/drape_tests/drape_tests.pro b/drape/drape_tests/drape_tests.pro new file mode 100644 index 0000000000..3925e63d73 --- /dev/null +++ b/drape/drape_tests/drape_tests.pro @@ -0,0 +1,31 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2013-09-18T09:14:21 +# +#------------------------------------------------- + +TARGET = drape_tests +CONFIG += console warn_on +CONFIG -= app_bundle +TEMPLATE = app +DEFINES += OGL_TEST_ENABLED GTEST_DONT_DEFINE_TEST + +DEPENDENCIES = base gmock +ROOT_DIR = ../.. +include($$ROOT_DIR/common.pri) + +DRAPE_DIR = .. +include($$DRAPE_DIR/drape_common.pri) + +INCLUDEPATH += $$ROOT_DIR/3party/gmock/include $$ROOT_DIR/3party/gmock/gtest/include + +SOURCES += \ + glfunctions.cpp \ + testingmain.cpp \ + failure_reporter.cpp \ + glmock_functions.cpp \ + buffer_tests.cpp \ + uniform_value_tests.cpp + +HEADERS += \ + glmock_functions.hpp diff --git a/omim.pro b/omim.pro index 30b5defcd2..3a0656a110 100644 --- a/omim.pro +++ b/omim.pro @@ -25,6 +25,7 @@ SUBDIRS = 3party \ platform/platform_tests \ anim \ drape \ + drape/drape_tests \ graphics \ gui \ storage storage/storage_tests \