Merge pull request ton-blockchain#341 from newton-blockchain/rebased_…

…wallets

Merge changes to build wallets

CMakeLists.txt

@@ -284,8 +284,9 @@ if (MSVC)
 endif()
 if (NOT MSVC)
   add_cxx_compiler_flag("-Wall")
+  add_cxx_compiler_flag("-Wextra")
 endif()
-add_cxx_compiler_flag("-Wextra")
+
 add_cxx_compiler_flag("-Wimplicit-fallthrough=2")
 add_cxx_compiler_flag("-Wpointer-arith")
 add_cxx_compiler_flag("-Wcast-qual")

example/android/CMakeLists.txt

@@ -7,9 +7,14 @@ cmake_minimum_required(VERSION 3.4.1 FATAL_ERROR)
 
 option(TONLIB_ENABLE_JNI "Enable JNI-compatible TonLib API" ON)
 
-string(APPEND CMAKE_CXX_FLAGS " -std=c++14 -Wall -Wextra -Wno-unused-parameter -Wno-deprecated-declarations -Wconversion -Wno-sign-conversion -fno-omit-frame-pointer -ffunction-sections -fdata-sections")
-string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,--gc-sections -Wl,--exclude-libs,ALL")
-
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  string(APPEND CMAKE_CXX_FLAGS " -std=c++14 -fno-omit-frame-pointer -ffunction-sections -fdata-sections")
+else()
+  string(APPEND CMAKE_CXX_FLAGS " -std=c++14 -Wall -Wextra -Wno-unused-parameter -Wno-deprecated-declarations -Wconversion -Wno-sign-conversion -fno-omit-frame-pointer -ffunction-sections -fdata-sections")
+endif()
+if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,--gc-sections -Wl,--exclude-libs,ALL")
+endif()
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.
 # You can define multiple libraries, and CMake builds them for you.
@@ -37,9 +42,15 @@ target_link_libraries(native-lib tonlib)
 set(TONLIB_API_JAVA_PACKAGE "drinkless/org/ton")
 target_compile_definitions(native-lib PRIVATE PACKAGE_NAME="${TONLIB_API_JAVA_PACKAGE}")
 
-add_custom_command(TARGET native-lib POST_BUILD
-  COMMAND ${CMAKE_COMMAND} -E rename $<TARGET_FILE:native-lib> $<TARGET_FILE:native-lib>.debug
-  COMMAND ${CMAKE_STRIP} --strip-debug --strip-unneeded $<TARGET_FILE:native-lib>.debug -o $<TARGET_FILE:native-lib>)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  add_custom_command(TARGET native-lib POST_BUILD
+          COMMAND ${CMAKE_COMMAND} -E rename $<TARGET_FILE:native-lib> $<TARGET_FILE:native-lib>.debug
+          COMMAND ${CMAKE_STRIP} -S $<TARGET_FILE:native-lib>.debug -o $<TARGET_FILE:native-lib>)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  add_custom_command(TARGET native-lib POST_BUILD
+          COMMAND ${CMAKE_COMMAND} -E rename $<TARGET_FILE:native-lib> $<TARGET_FILE:native-lib>.debug
+          COMMAND ${CMAKE_STRIP} --strip-debug --strip-unneeded $<TARGET_FILE:native-lib>.debug -o $<TARGET_FILE:native-lib>)
+endif()
 
 if (NOT CMAKE_CROSSCOMPILING)
   set(TONLIB_API_JAVA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/)