FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Jorge Ciges, "1rst - Changes in Cmake: They make possible "make install" with the android building.

Browse Source 
2nd - Script to use a 3rd party directory with basic libraries: libjpeg,libpng,libtiff,giflib,freetype,curl,gdal.

3rd - Change in the GLES library loading for Android. That should make GLES2 work properly.

4rth- Included two defines RGB8_OES and RGBA8_OES as a substitute in GLES for RGB8 and RGBA8

5th - OpenGL and GLSL version identification changed to recognize GLES  versions properly
"
This commit is contained in:
Robert Osfield
2011-04-21 12:53:22 +00:00
parent cd44e63b90
commit 478e0f3ebf
5 changed files with 164 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
CMakeModules/OsgAndroidMacroUtils.cmake
View File

@@ -9,7 +9,7 @@ MACRO(SETUP_ANDROID_LIBRARY LIB_NAME)
set(MODULE_SOURCES "${MODULE_SOURCES} ${n_f}")
endforeach(arg ${TARGET_SRC})
#SET(MODULE_INCLUDES "${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include")
#SET(MODULE_INCLUDES "${CMAKE_SOURCE_DIR}/include include")
GET_DIRECTORY_PROPERTY(loc_includes INCLUDE_DIRECTORIES)
foreach(arg ${loc_includes})
IF(NOT "${arg}" MATCHES "/usr/include" AND NOT "${arg}" MATCHES "/usr/local/include")
@@ -53,3 +53,128 @@ MACRO(SETUP_ANDROID_LIBRARY LIB_NAME)
configure_file("${OSG_ANDROID_TEMPLATES}/Android.mk.modules.in" "${CMAKE_CURRENT_BINARY_DIR}/Android.mk")
ENDMACRO()
MACRO(ANDROID_3RD_PARTY)
################################################
#JPEG
################################################
FIND_PATH(JPEG_INCLUDE_DIR Android.mk
${CMAKE_SOURCE_DIR}/3rdparty/libjpeg
)
#set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libjpeg")
#set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${JPEG_INCLUDE_DIR}/Android.mk \n")
if(JPEG_INCLUDE_DIR)
message(STATUS "Jpeg found ${JPEG_INCLUDE_DIR}" )
set(JPEG_FOUND "Yes")
install(DIRECTORY 3rdparty/build/libjpeg/ DESTINATION ./ )
else(JPEG_INCLUDE_DIR)
message(STATUS "Jpeg missing" )
endif()
################################################
#PNG
################################################
FIND_PATH(PNG_INCLUDE_DIR Android.mk
${CMAKE_SOURCE_DIR}/3rdparty/libpng
)
#set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libpng")
#set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${PNG_INCLUDE_DIR}/Android.mk \n")
if(PNG_INCLUDE_DIR)
message(STATUS "PNG found ${PNG_INCLUDE_DIR}" )
set(PNG_FOUND "Yes")
install(DIRECTORY 3rdparty/build/libpng/ DESTINATION ./ )
else(PNG_INCLUDE_DIR)
message(STATUS "PNG missing" )
endif()
################################################
#GIF
################################################
FIND_PATH(GIFLIB_INCLUDE_DIR Android.mk
${CMAKE_SOURCE_DIR}/3rdparty/giflib
)
#set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libgif")
#set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${GIFLIB_INCLUDE_DIR}/Android.mk \n")
if(GIFLIB_INCLUDE_DIR)
message(STATUS "GIF found ${GIFLIB_INCLUDE_DIR}" )
set(GIFLIB_FOUND "Yes")
install(DIRECTORY 3rdparty/build/giflib/ DESTINATION ./ )
else(GIFLIB_INCLUDE_DIR)
message(STATUS "GIF missing" )
endif()
################################################
#TIF
################################################
FIND_PATH(TIFF_INCLUDE_DIR Android.mk
${CMAKE_SOURCE_DIR}/3rdparty/libtiff
)
#set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libtiff")
#set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${TIFF_INCLUDE_DIR}/Android.mk \n")
if(TIFF_INCLUDE_DIR)
message(STATUS "TIF found ${TIFF_INCLUDE_DIR}" )
set(TIFF_FOUND "Yes")
install(DIRECTORY 3rdparty/build/libtiff/ DESTINATION ./ )
else(TIFF_INCLUDE_DIR)
message(STATUS "TIF missing" )
endif()
################################################
#ZLIB
################################################
#FIND_PATH(ZLIB_INCLUDE_DIR Android.mk
# ${CMAKE_SOURCE_DIR}/3rdparty/zlib
#)
#set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} zlib")
#set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${ZLIB_INCLUDE_DIR}/Android.mk \n")
#if(ZLIB_INCLUDE_DIR)
# message(STATUS "ZLIB found ${ZLIB_INCLUDE_DIR}" )
# set(ZLIB_FOUND "Yes")
# install(DIRECTORY 3rdparty/build/libjpeg/ DESTINATION ./ )
#else(ZLIB_INCLUDE_DIR)
# message(STATUS "ZLIB missing" )
#endif()
################################################
#CURL
################################################
FIND_PATH(CURL_DIR Android.mk
${CMAKE_SOURCE_DIR}/3rdparty/curl
)
#set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libcurl")
#set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${CURL_DIR}/Android.mk \n")
set(CURL_INCLUDE_DIR ${CURL_DIR}/include)
set(CURL_INCLUDE_DIRS ${CURL_DIR}/include) #Both are defined in FindCurl
if(CURL_DIR)
message(STATUS "Curl found ${CURL_DIR}" )
set(CURL_FOUND "Yes")
install(DIRECTORY 3rdparty/build/curl/ DESTINATION ./ )
else(CURL_DIR)
message(STATUS "Curl missing" )
endif()
################################################
#FREETYPE
################################################
FIND_PATH(FREETYPE_DIR Android.mk
${CMAKE_SOURCE_DIR}/3rdparty/freetype
)
#set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libft2")
#set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${FREETYPE_DIR}/Android.mk \n")
set(FREETYPE_INCLUDE_DIRS "${FREETYPE_DIR}/include ${FREETYPE_DIR}/include/freetype/config")
if(FREETYPE_DIR)
message(STATUS "FREETYPE found ${FREETYPE_DIR}" )
set(FREETYPE_FOUND "Yes")
install(DIRECTORY 3rdparty/build/freetype/ DESTINATION ./ )
else(FREETYPE_DIR)
message(STATUS "FREETYPE missing" )
endif()
################################################
#GDAL
################################################
FIND_PATH(GDAL_DIR gdal.h
${CMAKE_SOURCE_DIR}/3rdparty/gdal/include
)
set(GDAL_INCLUDE_DIR "${GDAL_DIR}")
if(GDAL_DIR)
message(STATUS "GDAL found ${GDAL_DIR}" )
set(GDAL_FOUND "Yes")
install(DIRECTORY 3rdparty/build/gdal/ DESTINATION ./ )
else(GDAL_DIR)
message(STATUS "GDAL missing" )
endif()
ENDMACRO()