[Flightgear-commitlogs] FlightGear branch, next, updated. f054f156934150ef132317825b5964774a5b472c

[Flightgear-commitlogs <ma...@hy...>]

The branch, next has been updated

- Log -----------------------------------------------------------------
commit f054f156934150ef132317825b5964774a5b472c
Author: James Turner
Date:   Tue Nov 29 10:24:33 2011 +0000

    Fixes for linking with shared SimGear.


- Summary -------------------------------------------------------------

 CMakeModules/FindSimGear.cmake         |   16 +++++++++++-----
 src/Instrumentation/HUD/HUD_runway.cxx |    2 +-
 src/Main/CMakeLists.txt                |    4 +---
 utils/GPSsmooth/CMakeLists.txt         |    3 +++
 4 files changed, 16 insertions(+), 9 deletions(-)


- Diff ----------------------------------------------------------------

diff --git a/CMakeModules/FindSimGear.cmake b/CMakeModules/FindSimGear.cmake
index e1becbe..3d7b271 100644
--- a/CMakeModules/FindSimGear.cmake
+++ b/CMakeModules/FindSimGear.cmake
@@ -116,6 +116,7 @@ if(SIMGEAR_SHARED)
     set(SIMGEAR_CORE_LIBRARIES ${SIMGEAR_SHARED_CORE_LIBRARY})
     set(SIMGEAR_LIBRARIES ${SIMGEAR_SHARED_SCENE_LIBRARY} ${SIMGEAR_SHARED_CORE_LIBRARY})
     set(SIMGEAR_CORE_LIBRARY_DEPENDENCIES "")
+    set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES "")
     
 else(SIMGEAR_SHARED)
 
@@ -127,17 +128,13 @@ else(SIMGEAR_SHARED)
   # linked in, and hence ability to link when using a traditional
   # linker such as GNU ld on Linux
     set(comps
-        tsync
         environment
         nasal
         bucket
-        bvh
-        util 
         route
         timing
         io
         serial
-        sound
         math
         props
         structure
@@ -149,12 +146,16 @@ else(SIMGEAR_SHARED)
     )
 
     set(scene_comps
+        tsync
         ephem
         sky
         material
         tgdb
         model
-        screen)
+        screen
+        bvh
+        util
+        sound)
             
     foreach(component ${comps})
         find_sg_component(${component} SIMGEAR_CORE_LIBRARIES)
@@ -171,6 +172,11 @@ else(SIMGEAR_SHARED)
         ${CMAKE_THREAD_LIBS_INIT}
         ${ZLIB_LIBRARY})
 
+    set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES 
+        ${ALUT_LIBRARY} 
+    	${OPENAL_LIBRARY}
+    	${LIBSVN_LIBRARIES})
+
     if(WIN32)
         list(APPEND SIMGEAR_CORE_LIBRARY_DEPENDENCIES ws2_32.lib)
     endif(WIN32)
diff --git a/src/Instrumentation/HUD/HUD_runway.cxx b/src/Instrumentation/HUD/HUD_runway.cxx
index 6f05a70..42f2e44 100644
--- a/src/Instrumentation/HUD/HUD_runway.cxx
+++ b/src/Instrumentation/HUD/HUD_runway.cxx
@@ -25,7 +25,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/math/project.hxx>
+#include <simgear/scene/util/project.hxx>
 
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index e3e06aa..18bb7f9 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -73,14 +73,12 @@ target_link_libraries(fgfs
 	${FG_LIBS}
 	${SIMGEAR_LIBRARIES}
 	${OPENSCENEGRAPH_LIBRARIES}
-	${ALUT_LIBRARY} 
-	${OPENAL_LIBRARY}
 	${OPENGL_LIBRARIES}
 	${PLIB_LIBRARIES}
 	${JPEG_LIBRARY}
-	${LIBSVN_LIBRARIES}
 	${HLA_LIBRARIES}
 	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+	${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
 	${PLATFORM_LIBS}
 )
 
diff --git a/utils/GPSsmooth/CMakeLists.txt b/utils/GPSsmooth/CMakeLists.txt
index ecfdde7..47bc1d5 100644
--- a/utils/GPSsmooth/CMakeLists.txt
+++ b/utils/GPSsmooth/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries(GPSsmooth
 	${PLIB_SG_LIBRARY}
 	${PLIB_UL_LIBRARY}
 	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+	${ZLIB_LIBRARY}
 	${WINMM_LIBRARY}
 )
 
@@ -21,6 +22,7 @@ target_link_libraries(MIDGsmooth
 	${PLIB_SG_LIBRARY}
 	${PLIB_UL_LIBRARY}
 	${WINMM_LIBRARY}
+	${ZLIB_LIBRARY}
 	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
 )
 
@@ -29,6 +31,7 @@ target_link_libraries(UGsmooth
 	${PLIB_SG_LIBRARY}
 	${PLIB_UL_LIBRARY}
 	${WINMM_LIBRARY}
+	${ZLIB_LIBRARY}
 	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
 )
 


-----------------------------------------------------------------------


FlightGear