aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fabo@debian.org>2011-10-21 21:52:10 +0300
committerFathi Boudra <fabo@debian.org>2011-10-21 21:52:10 +0300
commit33e4aee565b667d2a13902525ca95b8cd300c3c3 (patch)
treea912da66373b152c8f34a9cdc511458fdaab3cee
parent34b231499fe8a46e7b2c82db51f706a4a9f96142 (diff)
link against GLESv2
-rw-r--r--examples/01.HelloWorld/Makefile4
-rw-r--r--examples/02.Quake3Map/Makefile4
-rw-r--r--examples/03.CustomSceneNode/Makefile4
-rw-r--r--examples/04.Movement/Makefile4
-rw-r--r--examples/05.UserInterface/Makefile5
-rw-r--r--examples/06.2DGraphics/Makefile4
-rw-r--r--examples/07.Collision/Makefile4
-rw-r--r--examples/08.SpecialFX/Makefile4
-rw-r--r--examples/09.Meshviewer/Makefile4
-rw-r--r--examples/10.Shaders/Makefile4
-rw-r--r--examples/11.PerPixelLighting/Makefile4
-rw-r--r--examples/12.TerrainRendering/Makefile4
-rw-r--r--examples/13.RenderToTexture/Makefile4
-rw-r--r--examples/14.Win32Window/Makefile4
-rw-r--r--examples/15.LoadIrrFile/Makefile4
-rw-r--r--examples/16.Quake3MapShader/Makefile4
-rw-r--r--examples/18.SplitScreen/Makefile4
-rw-r--r--examples/19.MouseAndJoystick/Makefile4
-rw-r--r--examples/20.ManagedLights/Makefile4
-rw-r--r--examples/21.Quake3Explorer/Makefile4
-rw-r--r--examples/22.MaterialViewer/Makefile3
-rw-r--r--examples/23.SMeshHandling/Makefile3
-rw-r--r--examples/24.CursorControl/Makefile3
-rw-r--r--examples/25.XmlHandling/Makefile3
-rw-r--r--examples/26.OcclusionQuery/Makefile3
-rw-r--r--examples/Demo/Makefile4
-rw-r--r--source/Irrlicht/Makefile3
-rw-r--r--tests/Makefile3
28 files changed, 56 insertions, 50 deletions
diff --git a/examples/01.HelloWorld/Makefile b/examples/01.HelloWorld/Makefile
index ea4b2b5..3f3db52 100644
--- a/examples/01.HelloWorld/Makefile
+++ b/examples/01.HelloWorld/Makefile
@@ -31,10 +31,10 @@ LDFLAGS = $(USERLDFLAGS)
#default target is Linux
all: all_linux
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
-all_linux: LDFLAGS += $(OGLESLIBS) -L/usr/X11R6/lib$(LIBSELECT) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
all_win32 clean_win32 static_win32: SUF=.exe
diff --git a/examples/02.Quake3Map/Makefile b/examples/02.Quake3Map/Makefile
index 5ae4c61..c387093 100644
--- a/examples/02.Quake3Map/Makefile
+++ b/examples/02.Quake3Map/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht
static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm
diff --git a/examples/03.CustomSceneNode/Makefile b/examples/03.CustomSceneNode/Makefile
index 51de069..294d948 100644
--- a/examples/03.CustomSceneNode/Makefile
+++ b/examples/03.CustomSceneNode/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/04.Movement/Makefile b/examples/04.Movement/Makefile
index 15cf5c9..070a1c5 100644
--- a/examples/04.Movement/Makefile
+++ b/examples/04.Movement/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
diff --git a/examples/05.UserInterface/Makefile b/examples/05.UserInterface/Makefile
index f59cfa6..119b944 100644
--- a/examples/05.UserInterface/Makefile
+++ b/examples/05.UserInterface/Makefile
@@ -16,10 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
-
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/06.2DGraphics/Makefile b/examples/06.2DGraphics/Makefile
index cfbb5d9..26c4159 100644
--- a/examples/06.2DGraphics/Makefile
+++ b/examples/06.2DGraphics/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/07.Collision/Makefile b/examples/07.Collision/Makefile
index 7a8f6d8..49ebb93 100644
--- a/examples/07.Collision/Makefile
+++ b/examples/07.Collision/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/08.SpecialFX/Makefile b/examples/08.SpecialFX/Makefile
index 93e28bf..6d98ae8 100644
--- a/examples/08.SpecialFX/Makefile
+++ b/examples/08.SpecialFX/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/09.Meshviewer/Makefile b/examples/09.Meshviewer/Makefile
index efa494a..e3c4858 100644
--- a/examples/09.Meshviewer/Makefile
+++ b/examples/09.Meshviewer/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/10.Shaders/Makefile b/examples/10.Shaders/Makefile
index bf863b3..ad2a85a 100644
--- a/examples/10.Shaders/Makefile
+++ b/examples/10.Shaders/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/11.PerPixelLighting/Makefile b/examples/11.PerPixelLighting/Makefile
index 6105da4..b68b54e 100644
--- a/examples/11.PerPixelLighting/Makefile
+++ b/examples/11.PerPixelLighting/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/12.TerrainRendering/Makefile b/examples/12.TerrainRendering/Makefile
index f37a8c5..19cb1f7 100644
--- a/examples/12.TerrainRendering/Makefile
+++ b/examples/12.TerrainRendering/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/13.RenderToTexture/Makefile b/examples/13.RenderToTexture/Makefile
index 1d58e8c..72dab7c 100644
--- a/examples/13.RenderToTexture/Makefile
+++ b/examples/13.RenderToTexture/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/14.Win32Window/Makefile b/examples/14.Win32Window/Makefile
index a8896f2..5f9d1aa 100644
--- a/examples/14.Win32Window/Makefile
+++ b/examples/14.Win32Window/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/15.LoadIrrFile/Makefile b/examples/15.LoadIrrFile/Makefile
index 8b0daa8..d97d00d 100644
--- a/examples/15.LoadIrrFile/Makefile
+++ b/examples/15.LoadIrrFile/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/16.Quake3MapShader/Makefile b/examples/16.Quake3MapShader/Makefile
index 88f93cb..9cd7f5e 100644
--- a/examples/16.Quake3MapShader/Makefile
+++ b/examples/16.Quake3MapShader/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/18.SplitScreen/Makefile b/examples/18.SplitScreen/Makefile
index 57df511..6921f0f 100644
--- a/examples/18.SplitScreen/Makefile
+++ b/examples/18.SplitScreen/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/19.MouseAndJoystick/Makefile b/examples/19.MouseAndJoystick/Makefile
index cb55526..295647b 100644
--- a/examples/19.MouseAndJoystick/Makefile
+++ b/examples/19.MouseAndJoystick/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
diff --git a/examples/20.ManagedLights/Makefile b/examples/20.ManagedLights/Makefile
index 73a06cb..324dd42 100644
--- a/examples/20.ManagedLights/Makefile
+++ b/examples/20.ManagedLights/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
diff --git a/examples/21.Quake3Explorer/Makefile b/examples/21.Quake3Explorer/Makefile
index 3bdcf05..186f65e 100644
--- a/examples/21.Quake3Explorer/Makefile
+++ b/examples/21.Quake3Explorer/Makefile
@@ -16,9 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/22.MaterialViewer/Makefile b/examples/22.MaterialViewer/Makefile
index 8016988..4114bcc 100644
--- a/examples/22.MaterialViewer/Makefile
+++ b/examples/22.MaterialViewer/Makefile
@@ -16,8 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/23.SMeshHandling/Makefile b/examples/23.SMeshHandling/Makefile
index eab5060..3d07339 100644
--- a/examples/23.SMeshHandling/Makefile
+++ b/examples/23.SMeshHandling/Makefile
@@ -16,8 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc
diff --git a/examples/24.CursorControl/Makefile b/examples/24.CursorControl/Makefile
index bc2a137..dc7d09f 100644
--- a/examples/24.CursorControl/Makefile
+++ b/examples/24.CursorControl/Makefile
@@ -31,9 +31,10 @@ LDFLAGS = $(USERLDFLAGS)
#default target is Linux
all: all_linux
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
all_win32 clean_win32 static_win32: SUF=.exe
diff --git a/examples/25.XmlHandling/Makefile b/examples/25.XmlHandling/Makefile
index 92f5655..f1b810f 100644
--- a/examples/25.XmlHandling/Makefile
+++ b/examples/25.XmlHandling/Makefile
@@ -31,9 +31,10 @@ LDFLAGS = $(USERLDFLAGS)
#default target is Linux
all: all_linux
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
all_win32 clean_win32 static_win32: SUF=.exe
diff --git a/examples/26.OcclusionQuery/Makefile b/examples/26.OcclusionQuery/Makefile
index 87e37e4..23824dc 100644
--- a/examples/26.OcclusionQuery/Makefile
+++ b/examples/26.OcclusionQuery/Makefile
@@ -16,8 +16,9 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
diff --git a/examples/Demo/Makefile b/examples/Demo/Makefile
index c96f49e..116a658 100644
--- a/examples/Demo/Makefile
+++ b/examples/Demo/Makefile
@@ -11,10 +11,10 @@ endif
all: all_linux
-OGLESLIBS := -L$(HOME)/irrlicht/SDKPackage-ogles1/Builds/OGLES/LinuxPC/Lib -lGLES_CM
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
all_linux: SYSTEM=Linux
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm
diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile
index 2c536ee..b08e979 100644
--- a/source/Irrlicht/Makefile
+++ b/source/Irrlicht/Makefile
@@ -77,6 +77,7 @@ ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
+OGLESLIBS := -lEGL -lGLESv2
#Linux specific options
staticlib sharedlib install: SYSTEM = Linux
STATIC_LIB = libIrrlicht.a
@@ -84,7 +85,7 @@ LIB_PATH = ../../lib/$(SYSTEM)
INSTALL_DIR = /usr/local/lib
sharedlib install: SHARED_LIB = libIrrlicht.so
staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lX11 -lz -lpng -ljpeg -lbz2
+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) $(OGLESLIBS) -lXxf86vm -lX11 -lz -lpng -ljpeg -lbz2
staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
#OSX specific options
diff --git a/tests/Makefile b/tests/Makefile
index 61051b5..e74bb78 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -12,9 +12,10 @@ endif
all: all_linux
+OGLESLIBS := -lEGL -lGLESv2
# target specific settings
all_linux: SYSTEM=Linux
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../lib/$(SYSTEM) -lIrrlicht $(OGLESLIBS) -lXxf86vm -lXext -lX11 -lXcursor -lz -lpng -ljpeg -lbz2
all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32: LDFLAGS = -L../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm