Remove CPPFLAG -I/usr/X11R6/include in all example Makefiles

None uses X11 directly, this is only needed in the Library itself. Also this was even added on all platforms while many don't even have X11. Thanks @Isomorphix noticing something off about that once (a long time ago...): https://irrlicht.sourceforge.io/forum/viewtopic.php?f=1&t=49033 git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6294 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-01-09 15:50:41 +00:00
parent 1dbab53e5a
commit 31f5da289f
30 changed files with 30 additions and 30 deletions
--- a/examples/01.HelloWorld/Makefile
+++ b/examples/01.HelloWorld/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/02.Quake3Map/Makefile
+++ b/examples/02.Quake3Map/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/03.CustomSceneNode/Makefile
+++ b/examples/03.CustomSceneNode/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/04.Movement/Makefile
+++ b/examples/04.Movement/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/05.UserInterface/Makefile
+++ b/examples/05.UserInterface/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/06.2DGraphics/Makefile
+++ b/examples/06.2DGraphics/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/07.Collision/Makefile
+++ b/examples/07.Collision/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/08.SpecialFX/Makefile
+++ b/examples/08.SpecialFX/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/09.Meshviewer/Makefile
+++ b/examples/09.Meshviewer/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/10.Shaders/Makefile
+++ b/examples/10.Shaders/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/11.PerPixelLighting/Makefile
+++ b/examples/11.PerPixelLighting/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/12.TerrainRendering/Makefile
+++ b/examples/12.TerrainRendering/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/13.RenderToTexture/Makefile
+++ b/examples/13.RenderToTexture/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/14.Win32Window/Makefile
+++ b/examples/14.Win32Window/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/15.LoadIrrFile/Makefile
+++ b/examples/15.LoadIrrFile/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/16.Quake3MapShader/Makefile
+++ b/examples/16.Quake3MapShader/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/17.HelloWorld_Mobile/Makefile
+++ b/examples/17.HelloWorld_Mobile/Makefile
@ -5,7 +5,7 @@ Target = 17.HelloWorld_Mobile
 Sources = main.cpp

 # general compiler settings
-CPPFLAGS = -I../../include -I/usr/X11R6/include
+CPPFLAGS = -I../../include
 CXXFLAGS = -O3 -ffast-math
 #CXXFLAGS = -g -Wall

--- a/examples/18.SplitScreen/Makefile
+++ b/examples/18.SplitScreen/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/19.MouseAndJoystick/Makefile
+++ b/examples/19.MouseAndJoystick/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/20.ManagedLights/Makefile
+++ b/examples/20.ManagedLights/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/21.Quake3Explorer/Makefile
+++ b/examples/21.Quake3Explorer/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/22.MaterialViewer/Makefile
+++ b/examples/22.MaterialViewer/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/23.SMeshHandling/Makefile
+++ b/examples/23.SMeshHandling/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/24.CursorControl/Makefile
+++ b/examples/24.CursorControl/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/25.XmlHandling/Makefile
+++ b/examples/25.XmlHandling/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/26.OcclusionQuery/Makefile
+++ b/examples/26.OcclusionQuery/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/27.PostProcessing/Makefile
+++ b/examples/27.PostProcessing/Makefile
@ -5,7 +5,7 @@ Target = 27.PostProcessing
 Sources = main.cpp

 # general compiler settings
-CPPFLAGS = -I../../include -I/usr/X11R6/include
+CPPFLAGS = -I../../include
 CXXFLAGS = -O3 -ffast-math
 #CXXFLAGS = -g -Wall

--- a/examples/28.CubeMapping/Makefile
+++ b/examples/28.CubeMapping/Makefile
@ -5,7 +5,7 @@ Target = 28.CubeMapping
 Sources = main.cpp

 # general compiler settings
-CPPFLAGS = -I../../include -I/usr/X11R6/include
+CPPFLAGS = -I../../include
 CXXFLAGS = -O3 -ffast-math
 #CXXFLAGS = -g -Wall

--- a/examples/30.Profiling/Makefile
+++ b/examples/30.Profiling/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
--- a/examples/Demo/Makefile
+++ b/examples/Demo/Makefile
@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)

 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else