From b99862ad9aefea58db9d844a3de4f4867f904129 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 14 Jan 2013 23:31:40 +1000
Subject: Don't use Irrlicht's built in png and jpeg libraries, they interfere
 with EFL's use of them.  Also leaving out Irrlichts built in zlib and bzip,
 plus leaving out the GUI, since that's what EFL is fer.

---
 libraries/irrlicht-1.8/source/Irrlicht/Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'libraries')

diff --git a/libraries/irrlicht-1.8/source/Irrlicht/Makefile b/libraries/irrlicht-1.8/source/Irrlicht/Makefile
index e931790..090e989 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/Makefile
+++ b/libraries/irrlicht-1.8/source/Irrlicht/Makefile
@@ -54,15 +54,12 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o
 
 # Next variable is for additional scene nodes etc. of customized Irrlicht versions
 EXTRAOBJ =
-LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
-	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
-	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
-	$(BZIP2OBJ) $(EXTRAOBJ)
+LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) $(LIBAESGM) $(EXTRAOBJ)
 
 ###############
 #Compiler flags
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
+CXXINCS = -I../../include
+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 -DNO_IRR_COMPILE_WITH_GUI_=1 -DNO_IRR_USE_NON_SYSTEM_JPEG_LIB_=1 -DNO_IRR_USE_NON_SYSTEM_LIB_PNG_=1 -DNO_IRR_USE_NON_SYSTEM_BZIP2_=1 -DNO_IRR_USE_NON_SYSTEM_ZLIB_=1
 CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
 ifndef NDEBUG
 CXXFLAGS += -g -D_DEBUG
-- 
cgit v1.1