summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/src/main/cpp/CMakeLists.txt133
1 files changed, 67 insertions, 66 deletions
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index c0222151..5347d049 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -30,25 +30,25 @@ include(lzo.cmake)
include(lz4.cmake)
include(openssl/openssl.cmake)
-if(NOT ${OPENVPN3OSSL} OR ${OPENVPN2MBED})
- add_subdirectory(mbedtls)
-endif()
+#if(NOT ${OPENVPN3OSSL} OR ${OPENVPN2MBED})
+# add_subdirectory(mbedtls)
+#endif()
# Super hacky way to determine flavour
#-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/arne/software/icsopenvpn/main/build/intermediates/cmake/normal/debug/obj/arm64-v8a
-if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*skeleton.*/")
- FIND_PACKAGE(SWIG 3.0 REQUIRED)
+#if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*skeleton.*/")
+# FIND_PACKAGE(SWIG 3.0 REQUIRED)
- add_custom_command(OUTPUT "ovpncli_wrap.cxx"
- COMMAND ${CMAKE_COMMAND} -E make_directory ovpn3
- COMMAND ${SWIG_EXECUTABLE} -outdir ovpn3
- -c++
- -java -package net.openvpn.ovpn3
- -outcurrentdir
- -DOPENVPN_PLATFORM_ANDROID
- -I${CMAKE_SOURCE_DIR}/openvpn3/client
- -I${CMAKE_SOURCE_DIR}/openvpn3
- ${CMAKE_SOURCE_DIR}/openvpn3/client/ovpncli.i)
+# add_custom_command(OUTPUT "ovpncli_wrap.cxx"
+# COMMAND ${CMAKE_COMMAND} -E make_directory ovpn3
+# COMMAND ${SWIG_EXECUTABLE} -outdir ovpn3
+# -c++
+# -java -package net.openvpn.ovpn3
+# -outcurrentdir
+# -DOPENVPN_PLATFORM_ANDROID
+# -I${CMAKE_SOURCE_DIR}/openvpn3/client
+# -I${CMAKE_SOURCE_DIR}/openvpn3
+# ${CMAKE_SOURCE_DIR}/openvpn3/client/ovpncli.i)
# proper way bunt unfinished
@@ -58,49 +58,49 @@ if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*s
#SWIG_ADD_MODULE(ovpen3cli java openvpn3/javacli/ovpncli.i)
- set(ovpn3_SRCS
- openvpn3/client/ovpncli.cpp
- openvpn3/openvpn/openssl/xkey/xkey_provider.c
- openvpn3/openvpn/openssl/xkey/xkey_helper.c
- ovpncli_wrap.cxx)
-
- add_library(ovpn3 SHARED ${ovpn3_SRCS})
-
- target_include_directories(ovpn3 PUBLIC
- ${CMAKE_CURRENT_SOURCE_DIR}/lzo/include
- ${CMAKE_CURRENT_SOURCE_DIR}/openvpn3
- ${CMAKE_CURRENT_SOURCE_DIR}/asio/asio/include
- ${CMAKE_CURRENT_SOURCE_DIR}/openvpn3/client
- ${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/include
- )
-
- if (${OPENVPN3OSSL})
- target_compile_definitions(ovpn3 PRIVATE
- -DUSE_OPENSSL
- )
- target_link_libraries(ovpn3 crypto ssl lzo lz4)
- else ()
- target_compile_definitions(ovpn3 PRIVATE
- -DUSE_MBEDTLS
- )
- target_link_libraries(ovpn3 mbedtls mbedx509 mbedcrypto lzo lz4)
- endif ()
-
- target_compile_definitions(ovpn3 PRIVATE
- -DHAVE_CONFIG_H
- -DHAVE_LZO
- -DHAVE_LZ4
- -DASIO_STANDALONE
- -DUSE_ASIO
- -DGIT_VERSION_STRING=\"${OPENVPN3_GIT}\"
- -DOPENVPN_SHOW_SESSION_TOKEN
- -DOPENSSL_API_COMPAT=0x10200000L
- -DOPENVPN_ALLOW_INSECURE_CERTPROFILE
- -DENABLE_EXTERNAL_PKI
- )
-else ()
- message("Not budiling OpenVPN for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
-endif ()
+ # set(ovpn3_SRCS
+ # openvpn3/client/ovpncli.cpp
+ # openvpn3/openvpn/openssl/xkey/xkey_provider.c
+ # openvpn3/openvpn/openssl/xkey/xkey_helper.c
+ # ovpncli_wrap.cxx)
+
+ # add_library(ovpn3 SHARED ${ovpn3_SRCS})
+
+ # target_include_directories(ovpn3 PUBLIC
+ # ${CMAKE_CURRENT_SOURCE_DIR}/lzo/include
+ # ${CMAKE_CURRENT_SOURCE_DIR}/openvpn3
+ # ${CMAKE_CURRENT_SOURCE_DIR}/asio/asio/include
+ # ${CMAKE_CURRENT_SOURCE_DIR}/openvpn3/client
+ # ${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/include
+ # )
+
+ # if (${OPENVPN3OSSL})
+# target_compile_definitions(ovpn3 PRIVATE
+# -DUSE_OPENSSL
+# )
+# target_link_libraries(ovpn3 crypto ssl lzo lz4)
+# else ()
+# target_compile_definitions(ovpn3 PRIVATE
+# -DUSE_MBEDTLS
+# )
+# target_link_libraries(ovpn3 mbedtls mbedx509 mbedcrypto lzo lz4)
+# endif ()
+
+ # target_compile_definitions(ovpn3 PRIVATE
+ # -DHAVE_CONFIG_H
+ # -DHAVE_LZO
+ # -DHAVE_LZ4
+ # -DASIO_STANDALONE
+ # -DUSE_ASIO
+ # -DGIT_VERSION_STRING=\"${OPENVPN3_GIT}\"
+ # -DOPENVPN_SHOW_SESSION_TOKEN
+ # -DOPENSSL_API_COMPAT=0x10200000L
+ # -DOPENVPN_ALLOW_INSECURE_CERTPROFILE
+ # -DENABLE_EXTERNAL_PKI
+ # )
+#else ()
+# message("Not building OpenVPN for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+#endif ()
add_library(ovpnutil SHARED ovpnutil/jniglue.c)
target_compile_definitions(ovpnutil PRIVATE -DTARGET_ARCH_ABI=\"${ANDROID_ABI}\"
@@ -109,15 +109,16 @@ target_compile_definitions(ovpnutil PRIVATE -DTARGET_ARCH_ABI=\"${ANDROID_ABI}\"
)
target_link_libraries(ovpnutil log)
-add_library(rsapss SHARED ovpnutil/rsapss.cpp)
-target_link_libraries(rsapss log crypto ssl)
+#add_library(rsapss SHARED ovpnutil/rsapss.cpp)
+#target_link_libraries(rsapss log crypto ssl)
-if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*skeleton.*/")
- add_library(osslspeedtest SHARED ovpnutil/sslspeed.c)
- target_link_libraries(osslspeedtest log crypto ssl)
-else ()
- message("Not budiling SSLSpeedTest for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
-endif ()
+#if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*skeleton.*/")
+# message("Building SSLSpeedTest for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+# add_library(osslspeedtest SHARED ovpnutil/sslspeed.c)
+# target_link_libraries(osslspeedtest log crypto ssl)
+#else ()
+# message("Not budiling SSLSpeedTest for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+#endif ()
set(openvpn_srcs
src/compat/compat-basename.c