Batyka/zaprett
1
0
Fork 0
mirror of https://github.com/egor-white/zaprett.git synced 2026-03-22 00:18:13 +05:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix conflicts between libnfqws and libnfqws2

Browse Source
This commit is contained in:
CherretGit
2026-03-17 23:00:57 +07:00
parent 15b15f4932
commit d5a38a8109
4 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rust/crates/libnfqws/CMakeLists.txt
View File

@@ -19,6 +19,8 @@ target_include_directories(nfqws PRIVATE
target_compile_definitions(nfqws PRIVATE main=nfqws_main)
target_compile_options(nfqws PRIVATE -w)
set_target_properties(nfqws PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/nfqws.map")
if(ANDROID)
find_library(LOG_LIB log)
target_link_libraries(nfqws PRIVATE ${LOG_LIB})

6
rust/crates/libnfqws/nfqws.map Normal file
View File

@@ -0,0 +1,6 @@
{
global:
nfqws_main;
local:
*;
};

3
rust/crates/libnfqws2/CMakeLists.txt
View File

@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 3.10)
project(nfqws2 C)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
file(GLOB NFQ_SOURCES "zapret2/nfq2/*.c")
@@ -17,6 +18,8 @@ target_include_directories(nfqws2 PRIVATE
target_compile_definitions(nfqws2 PRIVATE main=nfqws2_main)
target_compile_options(nfqws2 PRIVATE -w)
set_target_properties(nfqws2 PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/nfqws2.map")
if(ANDROID)
find_library(LOG_LIB log)
target_link_libraries(nfqws2 PRIVATE ${LOG_LIB})

6
rust/crates/libnfqws2/nfqws2.map Normal file
View File

@@ -0,0 +1,6 @@
{
global:
nfqws2_main;
local:
*;
};