From ba6631ba2beff33fa1f712d38d383fd95286cb73 Mon Sep 17 00:00:00 2001 From: Ruben Jesus Garcia-Hernandez <garcia@lrz.de> Date: Tue, 12 Feb 2019 18:37:50 +0100 Subject: [PATCH] Changes to enable compilation on IOS. --- NOMADVRLib/ConfigFile.cpp | 2 +- NOMADVRLib/ConfigFile.h | 2 +- NOMADVRLib/atoms.cpp | 2 +- libs/rply/rply.c | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NOMADVRLib/ConfigFile.cpp b/NOMADVRLib/ConfigFile.cpp index c776ea4..b40eda4 100644 --- a/NOMADVRLib/ConfigFile.cpp +++ b/NOMADVRLib/ConfigFile.cpp @@ -83,7 +83,7 @@ menubutton_t menubutton; std::vector<information> info; int secret; -const char * server; +char * server; int port; bool resetTimestepOnReload; diff --git a/NOMADVRLib/ConfigFile.h b/NOMADVRLib/ConfigFile.h index 8c7fe02..a26aec9 100644 --- a/NOMADVRLib/ConfigFile.h +++ b/NOMADVRLib/ConfigFile.h @@ -85,7 +85,7 @@ int loadConfigFile(const char * f); //for multiuser extern int secret; -extern const char * server; +extern char * server; extern int port; extern bool resetTimestepOnReload; diff --git a/NOMADVRLib/atoms.cpp b/NOMADVRLib/atoms.cpp index 25baead..c941c05 100644 --- a/NOMADVRLib/atoms.cpp +++ b/NOMADVRLib/atoms.cpp @@ -279,7 +279,7 @@ int readAtomsXYZ(const char *const file, int **numatoms, int *timesteps, float * { const char *myfile=nullptr; const char *webdownload="material.xyz"; -#if !defined(OCULUSMOBILE) && !defined(__ANDROID__) +#if !defined(OCULUSMOBILE) && !defined(__ANDROID__) && !defined(IOS) //add http support if (!strncmp(file, "http:", 5) || !strncmp(file, "https:", 6)) { char cmd[2048]; diff --git a/libs/rply/rply.c b/libs/rply/rply.c index 592b8d0..13fcf23 100644 --- a/libs/rply/rply.c +++ b/libs/rply/rply.c @@ -4,6 +4,7 @@ /* Changes: Rubén Jesús García Hernández Fix missing initialization, lines 379, 482 +*/ /* # Copyright 2016-2018 Ruben Jesus Garcia Hernandez -- GitLab