jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure helper libraries get built as static libs

Browse source 
Make sure helper libraries get built as static libs regardless
of the cmake version being used.

This fixes issue 217.

Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
This commit is contained in:
Bernhard Rosenkränzer 2017-05-04 15:44:37 +02:00
commit ee4d0b9c49
10 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
external/android-emugl/host/libs/GLESv1_dec/CMakeLists.txt vendored
View file

@ -20,5 +20,5 @@ if ("${cmake_build_type_lower}" STREQUAL "trace")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}")
endif()
add_library(GLESv1_dec ${SOURCES} ${GENERATED_SOURCES})
add_library(GLESv1_dec STATIC ${SOURCES} ${GENERATED_SOURCES})
target_link_libraries(GLESv1_dec OpenglCodecCommon)

2
external/android-emugl/host/libs/GLESv2_dec/CMakeLists.txt vendored
View file

@ -20,5 +20,5 @@ if ("${cmake_build_type_lower}" STREQUAL "trace")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}")
endif()
add_library(GLESv2_dec ${SOURCES} ${GENERATED_SOURCES})
add_library(GLESv2_dec STATIC ${SOURCES} ${GENERATED_SOURCES})
target_link_libraries(GLESv2_dec OpenglCodecCommon)

2
external/android-emugl/host/libs/Translator/GLcommon/CMakeLists.txt vendored
View file

@ -12,6 +12,6 @@ set(SOURCES
objectNameManager.cpp
FramebufferData.cpp)
add_library(GLcommon ${SOURCES})
add_library(GLcommon STATIC ${SOURCES})
target_link_libraries(GLcommon
emugl_common)

2
external/android-emugl/host/libs/libOpenGLESDispatch/CMakeLists.txt vendored
View file

@ -3,7 +3,7 @@ set(SOURCES
GLESv2Dispatch.cpp
GLESv1Dispatch.cpp)
add_library(OpenGLESDispatch ${SOURCES} ${GENERATED_SOURCES})
add_library(OpenGLESDispatch STATIC ${SOURCES} ${GENERATED_SOURCES})
target_link_libraries(OpenGLESDispatch
emugl_common
GLESv2_dec

2
external/android-emugl/host/libs/renderControl_dec/CMakeLists.txt vendored
View file

@ -16,5 +16,5 @@ if ("${cmake_build_type_lower}" STREQUAL "trace")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}")
endif()
add_library(renderControl_dec ${GENERATED_SOURCES})
add_library(renderControl_dec STATIC ${GENERATED_SOURCES})
target_link_libraries(renderControl_dec OpenglCodecCommon)