diff --git a/.gitignore b/.gitignore index cfb70c1..b21c142 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ Makefile* hanoi_towers/build/ HanoiTowersServer/build/ +Testing installer/installer diff --git a/CMakeLists.txt b/CMakeLists.txt index 8667a53..d97ca7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,6 @@ addReleaseQif("Client" ${DATA_DIR} ${TARGET_DIR}) addDeployAPK("Android" "${CMAKE_CURRENT_SOURCE_DIR}/hanoi_towers/android-libHanoiTowers.so-deployment-settings.json" "digitalface" "${SIGN_PATH}/DigitalFaceMobily.keystore" "${SIGN_STORE_PASSWORD}" "${TARGET_DIR}") -initAll() # Add sub directories add_subdirectory(SimpleQmlNotify) @@ -45,4 +44,5 @@ add_subdirectory(Patronum) add_subdirectory(HanoiTowersServer) add_subdirectory(HanoiTowersTerminal) +initAll() diff --git a/QtNetworkProtocol b/QtNetworkProtocol index 777921b..af0afcd 160000 --- a/QtNetworkProtocol +++ b/QtNetworkProtocol @@ -1 +1 @@ -Subproject commit 777921b1f9f112d5bcbc5f0dfff374f70df18823 +Subproject commit af0afcd60c3838aeba9176dc82d1d850d3cc2239