fix compilation issue with newest gradle

Consti10 · Sep 4, 2019 · b77f757 · b77f757
1 parent e601a24
commit b77f757
Show file tree

Hide file tree

Showing 7 changed files with 131 additions and 4 deletions.
diff --git a/FPV_VR/.idea/codeStyles/Project.xml b/FPV_VR/.idea/codeStyles/Project.xml
diff --git a/FPV_VR/.idea/gradle.xml b/FPV_VR/.idea/gradle.xml
diff --git a/FPV_VR/.idea/vcs.xml b/FPV_VR/.idea/vcs.xml
diff --git a/FPV_VR/app/src/main/cpp/GLPrograms/GLTextObj.cpp b/FPV_VR/app/src/main/cpp/GLPrograms/GLTextObj.cpp
@@ -1,4 +1,5 @@
 
+#include <pthread.h>
 #include "GLTextObj.h"
 
 GLTextObj::GLTextObj(std::string text, float x, float y, float z, float textH, float r, float g,

diff --git a/FPV_VR/app/src/main/cpp/Network/UDPReceiver.cpp b/FPV_VR/app/src/main/cpp/Network/UDPReceiver.cpp
@@ -52,7 +52,7 @@ void UDPReceiver::receiveFromUDPLoop() {
     myaddr.sin_family = AF_INET;
     myaddr.sin_addr.s_addr = htonl(INADDR_ANY);
     myaddr.sin_port = htons(mPort);
-    if (bind(mSocket, (struct sockaddr *) &myaddr, sizeof(myaddr)) == -1) {
+    if (::bind(mSocket, (struct sockaddr *) &myaddr, sizeof(myaddr)) == -1) {
         LOGV("Error binding Port; %d", mPort);
         return;
     }

diff --git a/FPV_VR/build.gradle b/FPV_VR/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.5.0'
 
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/FPV_VR/gradle/wrapper/gradle-wrapper.properties b/FPV_VR/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 02 20:16:03 CET 2017
+#Wed Sep 04 13:48:05 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip