teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

RPI v3 patch #1

Browse source
This commit is contained in:
Koncord 2017-01-03 19:03:51 +08:00
parent 59c3dbe6af
commit 27afb91936
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -220,7 +220,6 @@ endif()
IF(BUILD_OPENMW OR BUILD_OPENCS) IF(BUILD_OPENMW OR BUILD_OPENCS)
find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgUtil osgFX) find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgUtil osgFX)
include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})
set(USED_OSG_PLUGINS set(USED_OSG_PLUGINS
osgdb_bmp osgdb_bmp
@ -259,6 +258,8 @@ IF(BUILD_OPENMW OR BUILD_OPENCS)
ENDIF(BUILD_OPENMW OR BUILD_OPENCS) ENDIF(BUILD_OPENMW OR BUILD_OPENCS)
include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})
set(BOOST_COMPONENTS system filesystem program_options) set(BOOST_COMPONENTS system filesystem program_options)
if(WIN32) if(WIN32)

24
components/CMakeLists.txt
View file

@ -20,11 +20,13 @@ else (GIT_CHECKOUT)
configure_file(${VERSION_IN_FILE} ${VERSION_FILE}) configure_file(${VERSION_IN_FILE} ${VERSION_FILE})
endif (GIT_CHECKOUT) endif (GIT_CHECKOUT)
if (OPENGL_ES) if(BUILD_OPENMW OR BUILD_OPENCS)
find_package(OpenGLES REQUIRED) if (OPENGL_ES)
else() find_package(OpenGLES REQUIRED)
find_package(OpenGL REQUIRED) else()
endif() find_package(OpenGL REQUIRED)
endif()
endif(BUILD_OPENMW OR BUILD_OPENCS)
# source files # source files
@ -215,11 +217,13 @@ include_directories(${Bullet_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
add_library(components STATIC ${COMPONENT_FILES} ${MOC_SRCS} ${ESM_UI_HDR}) add_library(components STATIC ${COMPONENT_FILES} ${MOC_SRCS} ${ESM_UI_HDR})
if (OPENGL_ES) if(BUILD_OPENMW OR BUILD_OPENCS)
set(GL_LIB ${OPENGLES_gl_LIBRARY}) if (OPENGL_ES)
else() set(GL_LIB ${OPENGLES_gl_LIBRARY})
set(GL_LIB ${OPENGL_gl_LIBRARY}) else()
endif() set(GL_LIB ${OPENGL_gl_LIBRARY})
endif()
endif(BUILD_OPENMW OR BUILD_OPENCS)
target_link_libraries(components target_link_libraries(components
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}