Skip to content

Commit

Permalink
squash
Browse files Browse the repository at this point in the history
  • Loading branch information
jeff committed Jul 6, 2022
1 parent 76eeddc commit e56eef1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions contrib/ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ if ! [ -f LICENSE ] || ! [ -d llarp ]; then
fi

mkdir -p build/iphone
cd build/iphone
cmake \
-G Xcode \
-DCMAKE_TOOLCHAIN_FILE=../../external/ios-cmake/ios.toolchain.cmake \
Expand All @@ -27,7 +26,8 @@ cmake \
-DSUBMODULE_CHECK=ON \
-DWITH_LTO=ON \
-DPLATFORM=OS64COMBINED \
-DCMAKE_BUILD_TYPE=Release \
"$@" \
../..
xcrun build lokinet-shared
-DCMAKE_BUILD_TYPE=Debug \
-S . -B build/iphone \
"$@"

cmake --build build/iphone
6 changes: 3 additions & 3 deletions llarp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ add_library(liblokinet
dht/taglookup.cpp

endpoint_base.cpp

exit/context.cpp
exit/endpoint.cpp
exit/exit_messages.cpp
Expand Down Expand Up @@ -223,7 +223,7 @@ add_library(liblokinet
set_target_properties(liblokinet PROPERTIES OUTPUT_NAME lokinet)

enable_lto(lokinet-util lokinet-platform liblokinet)

if(TRACY_ROOT)
target_sources(liblokinet PRIVATE ${TRACY_ROOT}/TracyClient.cpp)
endif()
Expand Down Expand Up @@ -269,7 +269,7 @@ if(BUILD_LIBLOKINET)
set_property (TARGET lokinet-shared PROPERTY XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENT})
set_property (TARGET lokinet-shared PROPERTY XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEV_TEAM_ID})
endif()

endif()

if(APPLE)
Expand Down

0 comments on commit e56eef1

Please sign in to comment.