Compare commits
4
Commits
v3d-gfx-97
...
v3d-gfx-93
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7903ee35a3 | ||
|
|
8e1e22ce0e | ||
|
|
7c33bc6102 | ||
|
|
cd659ed8ff |
+10
-8
@@ -80,14 +80,16 @@ set_target_properties(GLESv2 PROPERTIES
|
||||
|
||||
set(se_libs_name)
|
||||
|
||||
if(USE_SE_V8)
|
||||
list(APPEND se_libs_name
|
||||
v8_monolith
|
||||
uv
|
||||
)
|
||||
if(USE_V8_DEBUGGER)
|
||||
list(APPEND se_libs_name inspector)
|
||||
endif()
|
||||
if(CC_EDITOR)
|
||||
message(STATUS "CC_EDITOR USE V8 FROM NODEJS")
|
||||
elseif(USE_SE_V8)
|
||||
list(APPEND se_libs_name
|
||||
v8_monolith
|
||||
uv
|
||||
)
|
||||
if(USE_V8_DEBUGGER)
|
||||
list(APPEND se_libs_name inspector)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# if(USE_SOCKETS)
|
||||
|
||||
@@ -8,10 +8,9 @@ set(BOOST_LIB_NAMES
|
||||
foreach(lib ${BOOST_LIB_NAMES})
|
||||
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${lib} boost/${lib})
|
||||
set_target_properties(boost_${lib} PROPERTIES FOLDER Utils)
|
||||
list(APPEND CC_EXTERNAL_LIBS boost_${lib})
|
||||
foreach(lib ${BOOST_LIBS})
|
||||
set_target_properties(${lib} PROPERTIES FOLDER Utils)
|
||||
target_compile_definitions(${lib} PUBLIC
|
||||
target_compile_definitions(boost_${lib} PUBLIC
|
||||
BOOST_UUID_FORCE_AUTO_LINK
|
||||
)
|
||||
list(APPEND CC_EXTERNAL_LIBS boost_${lib})
|
||||
endforeach()
|
||||
|
||||
|
||||
@@ -166,8 +166,9 @@ set_target_properties(tcmalloc PROPERTIES
|
||||
|
||||
set(se_libs_name)
|
||||
|
||||
if(USE_SE_V8)
|
||||
|
||||
if(CC_EDITOR)
|
||||
message(VERBOSE "CC_EDITOR USE V8 FROM NODEJS")
|
||||
elseif(USE_SE_V8)
|
||||
add_library(v8 SHARED IMPORTED GLOBAL)
|
||||
set_target_properties(v8 PROPERTIES
|
||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/v8.dll
|
||||
@@ -194,8 +195,8 @@ if(USE_SE_V8)
|
||||
)
|
||||
|
||||
set(se_libs_name v8)
|
||||
elseif(NOT CC_EDITOR)
|
||||
message(FATAL_ERROR "Only V8 is supported!")
|
||||
else()
|
||||
message(FATAL_ERROR "Only V8 is supported!")
|
||||
endif()
|
||||
|
||||
############################# glslang #############################
|
||||
|
||||
Reference in New Issue
Block a user