gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make libzt.a position_independent_code

Browse Source
This commit is contained in:
heri16
2020-08-05 17:42:31 +08:00
parent fcc8dcfd6c
commit 58c4cb9e7d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@@ -426,13 +426,14 @@ set_target_properties (ztcore PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${INTERMEDIATE_LIBRARY_OUTPUT_PATH}) LIBRARY_OUTPUT_DIRECTORY ${INTERMEDIATE_LIBRARY_OUTPUT_PATH})
# libzt.a # libzt.a
add_library (${STATIC_LIB_NAME} STATIC $<TARGET_OBJECTS:libzt_obj> add_library (${STATIC_LIB_NAME} STATIC $<TARGET_OBJECTS:zt_pic>
$<TARGET_OBJECTS:zto_obj> $<TARGET_OBJECTS:zto_pic>
$<TARGET_OBJECTS:libnatpmp_obj> $<TARGET_OBJECTS:natpmp_pic>
$<TARGET_OBJECTS:miniupnpc_obj> $<TARGET_OBJECTS:miniupnpc_pic>
$<TARGET_OBJECTS:lwip_obj> ${libztSrcGlob}) $<TARGET_OBJECTS:lwip_pic> ${libztSrcGlob})
set_target_properties (${STATIC_LIB_NAME} PROPERTIES set_target_properties (${STATIC_LIB_NAME} PROPERTIES
OUTPUT_NAME zt OUTPUT_NAME zt
POSITION_INDEPENDENT_CODE ON
LIBRARY_OUTPUT_DIRECTORY ${INTERMEDIATE_LIBRARY_OUTPUT_PATH}) LIBRARY_OUTPUT_DIRECTORY ${INTERMEDIATE_LIBRARY_OUTPUT_PATH})
set_target_properties (${STATIC_LIB_NAME} PROPERTIES COMPILE_FLAGS "${ZT_FLAGS}") set_target_properties (${STATIC_LIB_NAME} PROPERTIES COMPILE_FLAGS "${ZT_FLAGS}")
if (BUILDING_WIN) if (BUILDING_WIN)

3
examples/node/binding.gyp
View File

@@ -2,7 +2,6 @@
"targets": [ "targets": [
{ {
"include_dirs": [ "include_dirs": [
"libzt/lib/release/linux-x86_64",
"libzt/include", "libzt/include",
], ],
"includes": [ "includes": [
@@ -13,7 +12,7 @@
], ],
"conditions":[ "conditions":[
["OS=='linux' and target_arch=='x64'", { ["OS=='linux' and target_arch=='x64'", {
"libraries": [ "<(module_root_dir)/libzt/lib/release/linux-x86_64/libzt.so" ] "libraries": [ "<(module_root_dir)/libzt/lib/release/linux-x86_64/libzt.a" ]
}], }],
["OS=='mac' and target_arch=='x64'", { ["OS=='mac' and target_arch=='x64'", {
"libraries": [ "<(module_root_dir)/libzt/lib/release/macos-x86_64/libzt.a" ] "libraries": [ "<(module_root_dir)/libzt/lib/release/macos-x86_64/libzt.a" ]