Skip to content

Commit b77f757

Browse files
author
Consti10
committed
fix compilation issue with newest gradle
1 parent e601a24 commit b77f757

File tree

7 files changed

+131
-4
lines changed

7 files changed

+131
-4
lines changed

FPV_VR/.idea/codeStyles/Project.xml

Lines changed: 116 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FPV_VR/.idea/gradle.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FPV_VR/.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FPV_VR/app/src/main/cpp/GLPrograms/GLTextObj.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
#include <pthread.h>
23
#include "GLTextObj.h"
34

45
GLTextObj::GLTextObj(std::string text, float x, float y, float z, float textH, float r, float g,

FPV_VR/app/src/main/cpp/Network/UDPReceiver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void UDPReceiver::receiveFromUDPLoop() {
5252
myaddr.sin_family = AF_INET;
5353
myaddr.sin_addr.s_addr = htonl(INADDR_ANY);
5454
myaddr.sin_port = htons(mPort);
55-
if (bind(mSocket, (struct sockaddr *) &myaddr, sizeof(myaddr)) == -1) {
55+
if (::bind(mSocket, (struct sockaddr *) &myaddr, sizeof(myaddr)) == -1) {
5656
LOGV("Error binding Port; %d", mPort);
5757
return;
5858
}

FPV_VR/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
}
1212
}
1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:3.0.1'
14+
classpath 'com.android.tools.build:gradle:3.5.0'
1515

1616

1717
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Nov 02 20:16:03 CET 2017
1+
#Wed Sep 04 13:48:05 CEST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 commit comments

Comments
 (0)