1 From 73bed675202cf1f1c748540a4363d7d99e161dca Mon Sep 17 00:00:00 2001
2 From: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
3 Date: Thu, 9 Jun 2016 18:58:51 -0300
4 Subject: [PATCH 1/2] irrlicht: Get rid of unprefixed cflags
6 Cross-building requires proper include paths. This commit
7 removes the unprefixed -I/usr/X11R6/include in irrlicht cflags.
9 Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
11 Fix sent upstream as part of pull:
12 https://github.com/supertuxkart/stk-code/pull/2554
14 lib/irrlicht/CMakeLists.txt | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
17 diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
18 index 46d54008c291..5f4975e3a6f9 100644
19 --- a/lib/irrlicht/CMakeLists.txt
20 +++ b/lib/irrlicht/CMakeLists.txt
21 @@ -25,8 +25,8 @@ elseif(MINGW)
22 add_definitions(-D_IRR_STATIC_LIB_)
23 add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
25 - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing -I/usr/X11R6/include")
26 - set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing -I/usr/X11R6/include")
27 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing")
28 + set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing")
29 if(CMAKE_COMPILER_IS_GNUCC)
30 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexpensive-optimizations")