From caf61e06d9c646f21a742f8e1b920544e51891a8 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 31 Jan 2018 11:21:50 +0100
Subject: Version 0.7.3

---
 main/build.gradle                | 4 ++--
 main/src/main/cpp/CMakeLists.txt | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/build.gradle b/main/build.gradle
index 6b6d4580..87a36ef7 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -48,8 +48,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode = 155
-        versionName = "0.7.1"
+        versionCode = 156
+        versionName = "0.7.3"
 
         externalNativeBuild {
             cmake {
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index fa88ee4d..c708f077 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -22,13 +22,13 @@ include(openssl.cmake)
 #-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/.*noovpn3.*/")
     add_subdirectory(mbedtls)
-    add_custom_command(OUTPUT "javacli/ovpncli_wrap.cxx"
-      file(MAKE_DIRECTORY ovpn3/java/net/openvpn/ovpn3/)
+    add_custom_command(OUTPUT "openvpn3/javacli/ovpncli_wrap.cxx"
+      COMMAND ${CMAKE_COMMAND} -E make_directory ovpn3/java/net/openvpn/ovpn3/
       COMMAND swig -outdir ovpn3/java/net/openvpn/ovpn3/ -c++ -java -package net.openvpn.ovpn3 -I${CMAKE_SOURCE_DIR}/openvpn3/client -I${CMAKE_SOURCE_DIR}/openvpn3 ${CMAKE_SOURCE_DIR}/openvpn3/javacli/ovpncli.i)
 
     set(ovpn3_SRCS
       openvpn3/client/ovpncli.cpp
-      javacli/ovpncli_wrap.cxx)
+      openvpn3/javacli/ovpncli_wrap.cxx)
 
     add_library(ovpn3 SHARED ${ovpn3_SRCS})
 
@@ -179,7 +179,7 @@ target_link_libraries(nopie_openvpn.${ANDROID_ABI} PRIVATE openvpn)
 SET(OVPN_ASSET_DIR ${CMAKE_SOURCE_DIR}/../../../build/ovpnassets)
 
 add_custom_target(makeassetdir ALL
-    COMMAND ${CMAKE_COMMAND} -E make_directory MAKE_DIRECTORY ${OVPN_ASSET_DIR})
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${OVPN_ASSET_DIR})
 
 add_custom_command(TARGET nopie_openvpn.${ANDROID_ABI} POST_BUILD
   COMMAND
-- 
cgit v1.2.3