fly/flightgear
1
0
Fork 0
Code Activity

Revert to simgears thread support. Flightgear side.

Browse source 
For all source directories outside of simgear/scene,
which really depends very hard on osg, avoid using osg
classes. This should reenable the use of some basic and
scenegraph independent parts of simgear without the
the need for osg.
This commit is contained in:
Mathias Froehlich 2011-09-01 21:05:50 +02:00
parent c158619e3c
commit 6b6238293f
5 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeModules/FindSimGear.cmake
View file

@ -129,7 +129,6 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND")
bvh bvh
util route util route
timing timing
${thread_lib}
io io
serial serial
sound sound
@ -137,6 +136,7 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND")
props props
xml xml
misc misc
${thread_lib}
debug debug
magvar magvar
math) math)

6
utils/GPSsmooth/CMakeLists.txt
View file

@ -7,6 +7,7 @@ target_link_libraries(GPSsmooth
${SIMGEAR_IO_LIBRARY} ${SIMGEAR_IO_LIBRARY}
${SIMGEAR_MISC_LIBRARY} ${SIMGEAR_MISC_LIBRARY}
${SIMGEAR_STRUCTURE_LIBRARY} ${SIMGEAR_STRUCTURE_LIBRARY}
${SIMGEAR_THREADS_LIBRARY}
${SIMGEAR_TIMING_LIBRARY} ${SIMGEAR_TIMING_LIBRARY}
${SIMGEAR_DEBUG_LIBRARY} ${SIMGEAR_DEBUG_LIBRARY}
${PLIB_SG_LIBRARY} ${PLIB_SG_LIBRARY}
@ -15,7 +16,6 @@ target_link_libraries(GPSsmooth
${WINMM_LIBRARY} ${WINMM_LIBRARY}
${WINSOCK_LIBRARY} ${WINSOCK_LIBRARY}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${OPENTHREADS_LIBRARIES}
${RT_LIBRARY} ${RT_LIBRARY}
) )
@ -24,9 +24,9 @@ target_link_libraries(MIDGsmooth
${SIMGEAR_MATH_LIBRARY} ${SIMGEAR_MATH_LIBRARY}
${SIMGEAR_SERIAL_LIBRARY} ${SIMGEAR_SERIAL_LIBRARY}
${SIMGEAR_STRUCTURE_LIBRARY} ${SIMGEAR_STRUCTURE_LIBRARY}
${SIMGEAR_THREADS_LIBRARY}
${SIMGEAR_TIMING_LIBRARY} ${SIMGEAR_TIMING_LIBRARY}
${SIMGEAR_DEBUG_LIBRARY} ${SIMGEAR_DEBUG_LIBRARY}
${OPENTHREADS_LIBRARIES}
${PLIB_SG_LIBRARY} ${PLIB_SG_LIBRARY}
${PLIB_UL_LIBRARY} ${PLIB_UL_LIBRARY}
${WINMM_LIBRARY} ${WINMM_LIBRARY}
@ -41,8 +41,8 @@ target_link_libraries(UGsmooth
${SIMGEAR_MISC_LIBRARY} ${SIMGEAR_MISC_LIBRARY}
${SIMGEAR_SERIAL_LIBRARY} ${SIMGEAR_SERIAL_LIBRARY}
${SIMGEAR_STRUCTURE_LIBRARY} ${SIMGEAR_STRUCTURE_LIBRARY}
${SIMGEAR_THREADS_LIBRARY}
${SIMGEAR_TIMING_LIBRARY} ${SIMGEAR_TIMING_LIBRARY}
${OPENTHREADS_LIBRARIES}
${PLIB_SG_LIBRARY} ${PLIB_SG_LIBRARY}
${PLIB_UL_LIBRARY} ${PLIB_UL_LIBRARY}
${WINMM_LIBRARY} ${WINMM_LIBRARY}

4
utils/TerraSync/CMakeLists.txt
View file

@ -4,9 +4,9 @@ add_executable(terrasync terrasync.cxx)
target_link_libraries(terrasync target_link_libraries(terrasync
${SIMGEAR_LIBRARIES} ${SIMGEAR_LIBRARIES}
${OPENTHREADS_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${WINSOCK_LIBRARY}) ${WINSOCK_LIBRARY}
${RT_LIBRARY})
if(LIBSVN_FOUND) if(LIBSVN_FOUND)
target_link_libraries(terrasync ${LIBSVN_LIBRARIES}) target_link_libraries(terrasync ${LIBSVN_LIBRARIES})

3
utils/fgpanel/CMakeLists.txt
View file

@ -16,14 +16,13 @@ if(GLUT_FOUND)
panel_io.cxx) panel_io.cxx)
target_link_libraries(fgpanel target_link_libraries(fgpanel
${RT_LIBRARY}
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${GLUT_LIBRARIES} ${GLUT_LIBRARIES}
${SIMGEAR_LIBRARIES} ${SIMGEAR_LIBRARIES}
${OPENTHREADS_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${PLIB_LIBRARIES} ${PLIB_LIBRARIES}
${RT_LIBRARY}
) )
install(TARGETS fgpanel RUNTIME DESTINATION bin) install(TARGETS fgpanel RUNTIME DESTINATION bin)

3
utils/fgviewer/CMakeLists.txt
View file

@ -6,6 +6,7 @@ target_link_libraries(fgviewer
${OPENSCENEGRAPH_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${PLIB_LIBRARIES}) ${PLIB_LIBRARIES}
${RT_LIBRARY})
install(TARGETS fgviewer RUNTIME DESTINATION bin) install(TARGETS fgviewer RUNTIME DESTINATION bin)