diff options
| author | Yuri Gorshenin <y@maps.me> | 2015-12-08 16:10:31 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:03:01 +0300 |
| commit | 6e6279c4d3d65bc9b07a0706cebbaef3382975b8 (patch) | |
| tree | 05d5c089a9f037bfd1763345a0d674b119b52f14 | |
| parent | 834f8be3f8fafc6f05d7bfe5661a49572291b417 (diff) | |
[build] Fixes to linux build.
| -rw-r--r-- | drape/drape_tests/drape_tests.pro | 2 | ||||
| -rw-r--r-- | drape/drape_tests/glfunctions.cpp | 2 | ||||
| -rw-r--r-- | drape_frontend/drape_frontend_tests/drape_frontend_tests.pro | 2 | ||||
| -rw-r--r-- | map/style_tests/style_tests.pro | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/drape/drape_tests/drape_tests.pro b/drape/drape_tests/drape_tests.pro index 787e9d161d..4962e67923 100644 --- a/drape/drape_tests/drape_tests.pro +++ b/drape/drape_tests/drape_tests.pro @@ -4,7 +4,7 @@ CONFIG -= app_bundle TEMPLATE = app DEFINES += OGL_TEST_ENABLED GTEST_DONT_DEFINE_TEST COMPILER_TESTS -DEPENDENCIES = qt_tstfrm platform coding base gmock freetype fribidi expat tomcrypt +DEPENDENCIES = qt_tstfrm indexer platform coding geometry base gmock freetype fribidi expat tomcrypt ROOT_DIR = ../.. SHADER_COMPILE_ARGS = $$PWD/../shaders shader_index.txt shader_def include($$ROOT_DIR/common.pri) diff --git a/drape/drape_tests/glfunctions.cpp b/drape/drape_tests/glfunctions.cpp index 88710a6086..46cbeb24ae 100644 --- a/drape/drape_tests/glfunctions.cpp +++ b/drape/drape_tests/glfunctions.cpp @@ -256,6 +256,8 @@ void GLFunctions::glBlendFunc(glConst srcFactor, glConst dstFactor) {} void GLFunctions::glDisable(glConst mode) {} +void GLFunctions::glDepthFunc(glConst depthFunc) {} + void GLFunctions::glUniformValueiv(int8_t location, int32_t * v, uint32_t size) {} void * GLFunctions::glMapBuffer(glConst, glConst) { return 0; } diff --git a/drape_frontend/drape_frontend_tests/drape_frontend_tests.pro b/drape_frontend/drape_frontend_tests/drape_frontend_tests.pro index 4b9b507616..874f6a2dca 100644 --- a/drape_frontend/drape_frontend_tests/drape_frontend_tests.pro +++ b/drape_frontend/drape_frontend_tests/drape_frontend_tests.pro @@ -4,7 +4,7 @@ CONFIG += console warn_on CONFIG -= app_bundle TEMPLATE = app -DEPENDENCIES = drape_frontend drape platform indexer geometry coding base expat +DEPENDENCIES = drape_frontend drape platform indexer geometry coding base expat tomcrypt ROOT_DIR = ../.. include($$ROOT_DIR/common.pri) diff --git a/map/style_tests/style_tests.pro b/map/style_tests/style_tests.pro index 9a3953a04d..4d77813816 100644 --- a/map/style_tests/style_tests.pro +++ b/map/style_tests/style_tests.pro @@ -6,7 +6,7 @@ TEMPLATE = app INCLUDEPATH += ../../3party/protobuf/src ROOT_DIR = ../.. -DEPENDENCIES = map indexer platform geometry coding base expat protobuf +DEPENDENCIES = map indexer platform geometry coding base expat protobuf tomcrypt macx-*: LIBS *= "-framework IOKit" |