From eb88b172e257e3d23ce30f0c5f9ebeded2d0d9a5 Mon Sep 17 00:00:00 2001
From: hybrid <hybrid@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Sat, 5 Dec 2009 18:16:21 +0000
Subject: [PATCH] Add bzip2 files to other project files.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3001 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 source/Irrlicht/Irrlicht-gcc.cbp        | 23 +++++++
 source/Irrlicht/Irrlicht.dev            | 90 +++++++++++++++++++++++++
 source/Irrlicht/Irrlicht7.1.vcproj      | 30 +++++++++
 source/Irrlicht/Irrlicht8.0.vcproj      | 40 +++++++++++
 source/Irrlicht/Irrlicht_mobile6.vcproj | 40 +++++++++++
 source/Irrlicht/Makefile                |  4 +-
 source/Irrlicht/SConstruct              |  6 ++
 7 files changed, 232 insertions(+), 1 deletion(-)

diff --git a/source/Irrlicht/Irrlicht-gcc.cbp b/source/Irrlicht/Irrlicht-gcc.cbp
index 785bb887..67b85f57 100644
--- a/source/Irrlicht/Irrlicht-gcc.cbp
+++ b/source/Irrlicht/Irrlicht-gcc.cbp
@@ -1213,6 +1213,29 @@
 		<Unit filename="aesGladman/sha1.h" />
 		<Unit filename="aesGladman/sha2.cpp" />
 		<Unit filename="aesGladman/sha2.h" />
+		<Unit filename="bzip2/blocksort.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="bzip2/bzcompress.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="bzip2/bzlib.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="bzip2/bzlib.h" />
+		<Unit filename="bzip2/bzlib_private.h" />
+		<Unit filename="bzip2/crctable.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="bzip2/decompress.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="bzip2/huffman.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="bzip2/randtable.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/source/Irrlicht/Irrlicht.dev b/source/Irrlicht/Irrlicht.dev
index c6a287c2..b215772f 100644
--- a/source/Irrlicht/Irrlicht.dev
+++ b/source/Irrlicht/Irrlicht.dev
@@ -6508,3 +6508,93 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit647]
+FileName=bzip2\blocksort.c
+Folder=Irrlicht/extern/bzip2
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit648]
+FileName=bzip2\bzcompress.c
+Folder=Irrlicht/extern/bzip2
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit649]
+FileName=bzip2\bzlib.c
+Folder=Irrlicht/extern/bzip2
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit650]
+FileName=bzip2\bzlib.h
+Folder=Irrlicht/extern/bzip2
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit651]
+FileName=bzip2\bzlib_private.h
+Folder=Irrlicht/extern/bzip2
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit652]
+FileName=bzip2\crctable.c
+Folder=Irrlicht/extern/bzip2
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit653]
+FileName=bzip2\decompress.c
+Folder=Irrlicht/extern/bzip2
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit654]
+FileName=bzip2\huffman.c
+Folder=Irrlicht/extern/bzip2
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit655]
+FileName=bzip2\randtable.c
+Folder=Irrlicht/extern/bzip2
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/source/Irrlicht/Irrlicht7.1.vcproj b/source/Irrlicht/Irrlicht7.1.vcproj
index cce5e523..ddb45836 100644
--- a/source/Irrlicht/Irrlicht7.1.vcproj
+++ b/source/Irrlicht/Irrlicht7.1.vcproj
@@ -2430,6 +2430,36 @@
 						RelativePath=".\aesGladman\sha2.h">
 					</File>
 				</Filter>
+				<Filter
+					Name="bzip2">
+					<File
+						RelativePath=".\bzip2\blocksort.c">
+					</File>
+					<File
+						RelativePath=".\bzip2\bzcompress.c">
+					</File>
+					<File
+						RelativePath=".\bzip2\bzlib.c">
+					</File>
+					<File
+						RelativePath=".\bzip2\bzlib.h">
+					</File>
+					<File
+						RelativePath=".\bzip2\bzlib_private.h">
+					</File>
+					<File
+						RelativePath=".\bzip2\crctable.c">
+					</File>
+					<File
+						RelativePath=".\bzip2\decompress.c">
+					</File>
+					<File
+						RelativePath=".\bzip2\huffman.c">
+					</File>
+					<File
+						RelativePath=".\bzip2\randtable.c">
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/source/Irrlicht/Irrlicht8.0.vcproj b/source/Irrlicht/Irrlicht8.0.vcproj
index 1f773f9d..b72d1227 100644
--- a/source/Irrlicht/Irrlicht8.0.vcproj
+++ b/source/Irrlicht/Irrlicht8.0.vcproj
@@ -3373,6 +3373,46 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="bzip2"
+					>
+					<File
+						RelativePath=".\bzip2\blocksort.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\bzcompress.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\bzlib.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\bzlib.h"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\bzlib_private.h"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\crctable.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\decompress.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\huffman.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\randtable.c"
+						>
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/source/Irrlicht/Irrlicht_mobile6.vcproj b/source/Irrlicht/Irrlicht_mobile6.vcproj
index 5ffc7b95..da1fa2ed 100644
--- a/source/Irrlicht/Irrlicht_mobile6.vcproj
+++ b/source/Irrlicht/Irrlicht_mobile6.vcproj
@@ -3012,6 +3012,46 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="bzip2"
+					>
+					<File
+						RelativePath=".\bzip2\blocksort.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\bzcompress.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\bzlib.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\bzlib.h"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\bzlib_private.h"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\crctable.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\decompress.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\huffman.c"
+						>
+					</File>
+					<File
+						RelativePath=".\bzip2\randtable.c"
+						>
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile
index 94a7f07e..dee40332 100644
--- a/source/Irrlicht/Makefile
+++ b/source/Irrlicht/Makefile
@@ -43,12 +43,14 @@ ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffas
 JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o
 LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o
 LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o
+BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.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) \
-	$(EXTRAOBJ)
+	$(BZIP2OBJ) $(EXTRAOBJ)
 
 ###############
 #Compiler flags
diff --git a/source/Irrlicht/SConstruct b/source/Irrlicht/SConstruct
index ae5d7353..8327c3f3 100644
--- a/source/Irrlicht/SConstruct
+++ b/source/Irrlicht/SConstruct
@@ -71,6 +71,12 @@ AESGLADMANOBJ = [];
 for fileName in AESGLADMANNAMES:
 	AESGLADMANOBJ += [AESGLADMAN_PREFIX + fileName];
 
+BZIP2_PREFIX = 'bzip2/';
+BZIP2NAMES = ['blocksort.c', 'bzcompress.c', 'bzlib.c', 'crctable.c', 'decompress.c', 'huffman.c', 'randtable.c'];
+BZIP2OBJ = [];
+for fileName in BZIP2NAMES:
+	BZIP2OBJ += [BZIP2_PREFIX + fileName];
+
 # Next variable is for additional scene nodes etc. of customized Irrlicht versions
 EXTRAOBJ = [];