From c14ec5218023211a157acd33cc29c73938254249 Mon Sep 17 00:00:00 2001 From: Michael Hartlef Date: Sat, 5 Dec 2020 14:48:07 +0100 Subject: [PATCH] CURL and build from source fix for 64bit Linux. --- modules/brl/native/httprequest.glfw.cpp | 1 + targets/glfw3/template/config.cxs | 2 +- targets/glfw3/template/gcc_linux/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/brl/native/httprequest.glfw.cpp b/modules/brl/native/httprequest.glfw.cpp index 81f5fe52..040b7c9a 100644 --- a/modules/brl/native/httprequest.glfw.cpp +++ b/modules/brl/native/httprequest.glfw.cpp @@ -4,6 +4,7 @@ // Libcurl for Linux will be from a system repository when installed #ifdef __linux__ #include +#include "curl/include/curl.h" #else #include "curl/include/curl.h" #endif diff --git a/targets/glfw3/template/config.cxs b/targets/glfw3/template/config.cxs index 838bceee..c330b758 100644 --- a/targets/glfw3/template/config.cxs +++ b/targets/glfw3/template/config.cxs @@ -1,4 +1,4 @@ - +#GLFW_GCC_CC_OPTS+=" -fpic " #GLFW_USE_MINGW=True #GLFW_GCC_MSIZE_WINNT="64" diff --git a/targets/glfw3/template/gcc_linux/Makefile b/targets/glfw3/template/gcc_linux/Makefile index 68b1e936..41673c91 100644 --- a/targets/glfw3/template/gcc_linux/Makefile +++ b/targets/glfw3/template/gcc_linux/Makefile @@ -1,4 +1,3 @@ - CC=gcc CFLAGS=-D_GLFW_X11 @@ -9,6 +8,7 @@ CPPFLAGS=$(CCOPTS) \ -Wno-int-to-pointer-cast \ -Wno-free-nonheap-object \ -Wno-unused-result \ +-I../curl/include \ -I../glfw3/include \ -I../openal/include \ -I../stb \