Include ShivaVG into libSimGearScene

This commit is contained in:
Thomas Geymayer 2012-11-04 20:00:53 +01:00
parent 9ab88d9387
commit 2d039e393a
2 changed files with 10 additions and 29 deletions

View File

@ -185,11 +185,17 @@ else()
add_definitions(-DHAVE_EXPAT_CONFIG_H) add_definitions(-DHAVE_EXPAT_CONFIG_H)
endif(SYSTEM_EXPAT) endif(SYSTEM_EXPAT)
check_include_file(inttypes.h HAVE_INTTYPES_H)
check_include_file(sys/time.h HAVE_SYS_TIME_H) check_include_file(sys/time.h HAVE_SYS_TIME_H)
check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H) check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H)
check_include_file(unistd.h HAVE_UNISTD_H) check_include_file(unistd.h HAVE_UNISTD_H)
check_include_file(windows.h HAVE_WINDOWS_H) check_include_file(windows.h HAVE_WINDOWS_H)
if(HAVE_INTTYPES_H)
# ShivaVG needs inttypes.h
add_definitions(-DHAVE_INTTYPES_H)
endif()
if(ENABLE_RTI) if(ENABLE_RTI)
# See if we have any rti library variant installed # See if we have any rti library variant installed
message(STATUS "RTI: ENABLED") message(STATUS "RTI: ENABLED")

View File

@ -1,20 +1,8 @@
include(CheckIncludeFile) include(SimGearComponent)
check_include_file("inttypes.h" HAVE_INTTYPES_H)
if(HAVE_INTTYPES_H) #add_definitions(-DVG_API_EXPORT)
add_definitions(-DHAVE_INTTYPES_H)
endif()
add_definitions(-DVG_API_EXPORT)
INCLUDE_DIRECTORIES( set(ShivaVG_Src
${OPENGL_INCLUDE_DIR}
../include
)
SET(INCROOT ../include/VG)
SET(SRCROOT .)
SET(ShivaVG_Src
${SRCROOT}/shArrays.c ${SRCROOT}/shArrays.c
${SRCROOT}/shArrays.h ${SRCROOT}/shArrays.h
${SRCROOT}/shContext.c ${SRCROOT}/shContext.c
@ -36,17 +24,4 @@ SET(ShivaVG_Src
${SRCROOT}/shVgu.c ${SRCROOT}/shVgu.c
) )
ADD_LIBRARY( simgear_scene_component(ShivaVG canvas/ShivaVG "${ShivaVG_Src}" "")
ShivaVG
${ShivaVG_Src}
)
TARGET_LINK_LIBRARIES(
ShivaVG
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
)
if(NOT SIMGEAR_HEADLESS)
install(TARGETS ShivaVG ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()