Skip to content

Commit

Permalink
[new renderer] add mac&ios cmake support (#342)
Browse files Browse the repository at this point in the history
* add mac&ios cmake support

* remove unused condition
  • Loading branch information
PatriceJiang authored and minggo committed Jan 9, 2019
1 parent 3b0d6eb commit a8b163e
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 0 deletions.
11 changes: 11 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ target_link_libraries(external
ext_md5
)



# use lua/js specific libs by property to prevent conflict
if(BUILD_JS_LIBS)
add_subdirectory(spidermonkey)
Expand Down Expand Up @@ -134,3 +136,12 @@ set_target_properties(external
FOLDER "External"
)


if(MACOSX OR IOS)
add_subdirectory(glsl-optimizer)
target_link_libraries(external
ext_glcpp_library
ext_glsl_optimizer
ext_libmesa
)
endif()
27 changes: 27 additions & 0 deletions glsl-optimizer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
cmake_minimum_required(VERSION 3.6)

set(lib_name glsl_optimizer)
set(target_name ext_${lib_name})

project(${lib_name})

include(../cmake/CocosExternalConfig.cmake)

add_library(ext_glcpp_library STATIC IMPORTED GLOBAL)
add_library(ext_glsl_optimizer STATIC IMPORTED GLOBAL)
add_library(ext_libmesa STATIC IMPORTED GLOBAL)


set_target_properties(${target_name} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include"
)

set_target_properties(ext_glcpp_library PROPERTIES
IMPORTED_LOCATION "${platform_spec_path}/libglcpp-library.a"
)
set_target_properties(ext_glsl_optimizer PROPERTIES
IMPORTED_LOCATION "${platform_spec_path}/libglsl_optimizer.a"
)
set_target_properties(ext_libmesa PROPERTIES
IMPORTED_LOCATION "${platform_spec_path}/libmesa.a"
)

0 comments on commit a8b163e

Please sign in to comment.