[Bf-blender-cvs] [3c45fdd171f] master: GHOST: Solve compilation error of test programs

Sergey Sharybin noreply at git.blender.org
Mon Mar 26 14:54:25 CEST 2018


Commit: 3c45fdd171fa6ebd65f19f9fac9b204865e13136
Author: Sergey Sharybin
Date:   Mon Mar 26 14:51:56 2018 +0200
Branches: master
https://developer.blender.org/rB3c45fdd171fa6ebd65f19f9fac9b204865e13136

GHOST: Solve compilation error of test programs

===================================================================

M	intern/ghost/test/CMakeLists.txt
M	intern/ghost/test/multitest/MultiTest.c

===================================================================

diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt
index fb9ef621ecf..e93832c9b4e 100644
--- a/intern/ghost/test/CMakeLists.txt
+++ b/intern/ghost/test/CMakeLists.txt
@@ -204,6 +204,7 @@ target_link_libraries(gears_c
 		string_lib
 		${OPENGL_gl_LIBRARY}
 		${OPENGL_glu_LIBRARY}
+		${CMAKE_DL_LIBS}
 		${PLATFORM_LINKLIBS}
 		)
 
@@ -218,6 +219,7 @@ target_link_libraries(gears_cpp
 		string_lib
 		${OPENGL_gl_LIBRARY}
 		${OPENGL_glu_LIBRARY}
+		${CMAKE_DL_LIBS}
 		${PLATFORM_LINKLIBS}
 		)
 
@@ -251,5 +253,6 @@ target_link_libraries(multitest_c
 		${OPENGL_glu_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();



More information about the Bf-blender-cvs mailing list