From 31f5da289f0be61b2b8407df5b74c985e2d84eb2 Mon Sep 17 00:00:00 2001 From: cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> Date: Sun, 9 Jan 2022 15:50:41 +0000 Subject: [PATCH] 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 --- examples/01.HelloWorld/Makefile | 2 +- examples/02.Quake3Map/Makefile | 2 +- examples/03.CustomSceneNode/Makefile | 2 +- examples/04.Movement/Makefile | 2 +- examples/05.UserInterface/Makefile | 2 +- examples/06.2DGraphics/Makefile | 2 +- examples/07.Collision/Makefile | 2 +- examples/08.SpecialFX/Makefile | 2 +- examples/09.Meshviewer/Makefile | 2 +- examples/10.Shaders/Makefile | 2 +- examples/11.PerPixelLighting/Makefile | 2 +- examples/12.TerrainRendering/Makefile | 2 +- examples/13.RenderToTexture/Makefile | 2 +- examples/14.Win32Window/Makefile | 2 +- examples/15.LoadIrrFile/Makefile | 2 +- examples/16.Quake3MapShader/Makefile | 2 +- examples/17.HelloWorld_Mobile/Makefile | 2 +- examples/18.SplitScreen/Makefile | 2 +- examples/19.MouseAndJoystick/Makefile | 2 +- examples/20.ManagedLights/Makefile | 2 +- examples/21.Quake3Explorer/Makefile | 2 +- examples/22.MaterialViewer/Makefile | 2 +- examples/23.SMeshHandling/Makefile | 2 +- examples/24.CursorControl/Makefile | 2 +- examples/25.XmlHandling/Makefile | 2 +- examples/26.OcclusionQuery/Makefile | 2 +- examples/27.PostProcessing/Makefile | 2 +- examples/28.CubeMapping/Makefile | 2 +- examples/30.Profiling/Makefile | 2 +- examples/Demo/Makefile | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/examples/01.HelloWorld/Makefile b/examples/01.HelloWorld/Makefile index 0b4f1ab..333a270 100644 --- 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 diff --git a/examples/02.Quake3Map/Makefile b/examples/02.Quake3Map/Makefile index 811894f..3ec2e56 100644 --- 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 diff --git a/examples/03.CustomSceneNode/Makefile b/examples/03.CustomSceneNode/Makefile index 39bdbb5..35ccd6c 100644 --- 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 diff --git a/examples/04.Movement/Makefile b/examples/04.Movement/Makefile index ae62ed6..534aa12 100644 --- 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 diff --git a/examples/05.UserInterface/Makefile b/examples/05.UserInterface/Makefile index d87d9be..7974423 100644 --- 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 diff --git a/examples/06.2DGraphics/Makefile b/examples/06.2DGraphics/Makefile index 902f78d..1f78acf 100644 --- 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 diff --git a/examples/07.Collision/Makefile b/examples/07.Collision/Makefile index 897cdcc..a9ae395 100644 --- 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 diff --git a/examples/08.SpecialFX/Makefile b/examples/08.SpecialFX/Makefile index 0829c95..8e273c8 100644 --- 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 diff --git a/examples/09.Meshviewer/Makefile b/examples/09.Meshviewer/Makefile index abd2ba0..5259d15 100644 --- 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 diff --git a/examples/10.Shaders/Makefile b/examples/10.Shaders/Makefile index ca98ef5..80ee648 100644 --- 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 diff --git a/examples/11.PerPixelLighting/Makefile b/examples/11.PerPixelLighting/Makefile index 7b9c4c8..0c1ce19 100644 --- 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 diff --git a/examples/12.TerrainRendering/Makefile b/examples/12.TerrainRendering/Makefile index d23643e..faf55b4 100644 --- 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 diff --git a/examples/13.RenderToTexture/Makefile b/examples/13.RenderToTexture/Makefile index 085dfb6..84edd0c 100644 --- 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 diff --git a/examples/14.Win32Window/Makefile b/examples/14.Win32Window/Makefile index fa63f41..531da35 100644 --- 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 diff --git a/examples/15.LoadIrrFile/Makefile b/examples/15.LoadIrrFile/Makefile index 884cb87..269281f 100644 --- 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 diff --git a/examples/16.Quake3MapShader/Makefile b/examples/16.Quake3MapShader/Makefile index 16930aa..ead8b8d 100644 --- 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 diff --git a/examples/17.HelloWorld_Mobile/Makefile b/examples/17.HelloWorld_Mobile/Makefile index a29ccaa..c90e93c 100644 --- 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 diff --git a/examples/18.SplitScreen/Makefile b/examples/18.SplitScreen/Makefile index 63faa8e..953060e 100644 --- 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 diff --git a/examples/19.MouseAndJoystick/Makefile b/examples/19.MouseAndJoystick/Makefile index 173d6c1..aa0ea53 100644 --- 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 diff --git a/examples/20.ManagedLights/Makefile b/examples/20.ManagedLights/Makefile index 9eec331..b76a5c6 100644 --- 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 diff --git a/examples/21.Quake3Explorer/Makefile b/examples/21.Quake3Explorer/Makefile index 702983c..2d8cd5a 100644 --- 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 diff --git a/examples/22.MaterialViewer/Makefile b/examples/22.MaterialViewer/Makefile index ef421bc..6ec3df4 100644 --- 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 diff --git a/examples/23.SMeshHandling/Makefile b/examples/23.SMeshHandling/Makefile index 02837ee..e8ebf7b 100644 --- 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 diff --git a/examples/24.CursorControl/Makefile b/examples/24.CursorControl/Makefile index c2ada6c..272a431 100644 --- 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 diff --git a/examples/25.XmlHandling/Makefile b/examples/25.XmlHandling/Makefile index 71c2e13..62e6088 100644 --- 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 diff --git a/examples/26.OcclusionQuery/Makefile b/examples/26.OcclusionQuery/Makefile index 1ee059c..72b8f13 100644 --- 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 diff --git a/examples/27.PostProcessing/Makefile b/examples/27.PostProcessing/Makefile index c590500..ecf44d8 100644 --- 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 diff --git a/examples/28.CubeMapping/Makefile b/examples/28.CubeMapping/Makefile index 22514c2..627c9ea 100644 --- 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 diff --git a/examples/30.Profiling/Makefile b/examples/30.Profiling/Makefile index ac80b1e..a8f345e 100644 --- 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 diff --git a/examples/Demo/Makefile b/examples/Demo/Makefile index 46156a0..25d85d2 100644 --- 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