diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-26 15:56:00 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-26 15:56:00 +0300 |
| commit | 21aca14e43326ea9af45f1e848ebca52808f8470 (patch) | |
| tree | 25c5838a8b40ecb5996c7f1ccdfc1a90f69bd23b /intern/ghost/test | |
| parent | 13f80a152a3a84286330b1bc6d9818279b976e91 (diff) | |
| parent | 3c45fdd171fa6ebd65f19f9fac9b204865e13136 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/ghost/test')
| -rw-r--r-- | intern/ghost/test/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | intern/ghost/test/multitest/MultiTest.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index ef6e8915871..da387094619 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -203,6 +203,11 @@ target_link_libraries(gears_c glewmx_lib string_lib ${OPENGL_gl_LIBRARY} +<<<<<<< HEAD +======= + ${OPENGL_glu_LIBRARY} + ${CMAKE_DL_LIBS} +>>>>>>> master ${PLATFORM_LINKLIBS} ) @@ -216,6 +221,11 @@ target_link_libraries(gears_cpp glewmx_lib string_lib ${OPENGL_gl_LIBRARY} +<<<<<<< HEAD +======= + ${OPENGL_glu_LIBRARY} + ${CMAKE_DL_LIBS} +>>>>>>> master ${PLATFORM_LINKLIBS} ) @@ -248,5 +258,6 @@ target_link_libraries(multitest_c ${OPENGL_gl_LIBRARY} ${FREETYPE_LIBRARY} ${ZLIB_LIBRARIES} + ${CMAKE_DL_LIBS} ${PLATFORM_LINKLIBS} ) diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c index a5b5a511cb2..833b5c720a1 100644 --- a/intern/ghost/test/multitest/MultiTest.c +++ b/intern/ghost/test/multitest/MultiTest.c @@ -949,7 +949,7 @@ int main(int argc, char **argv) MultiTestApp *app; #ifndef USE_BMF - BLF_init(11, 72); + BLF_init(); #endif app = multitestapp_new(); |