aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libraries/irrlicht-1.8/source/Irrlicht/bzip2
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-01-13 18:54:10 +1000
committerDavid Walter Seikel2013-01-13 18:54:10 +1000
commit959831f4ef5a3e797f576c3de08cd65032c997ad (patch)
treee7351908be5995f0b325b2ebeaa02d5a34b82583 /libraries/irrlicht-1.8/source/Irrlicht/bzip2
parentAdd info about changes to Irrlicht. (diff)
downloadSledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.zip
SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.gz
SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.bz2
SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.xz
Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.
Diffstat (limited to 'libraries/irrlicht-1.8/source/Irrlicht/bzip2')
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/bzip2/dlltest.c350
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/bzip2/dlltest.dsp186
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/bzip2/libbz2.def54
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/bzip2/libbz2.dsp260
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/bzip2/makefile.msc126
5 files changed, 488 insertions, 488 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/bzip2/dlltest.c b/libraries/irrlicht-1.8/source/Irrlicht/bzip2/dlltest.c
index 03fa146..4e27da2 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/bzip2/dlltest.c
+++ b/libraries/irrlicht-1.8/source/Irrlicht/bzip2/dlltest.c
@@ -1,175 +1,175 @@
1/* 1/*
2 minibz2 2 minibz2
3 libbz2.dll test program. 3 libbz2.dll test program.
4 by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp) 4 by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)
5 This file is Public Domain. Welcome any email to me. 5 This file is Public Domain. Welcome any email to me.
6 6
7 usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename] 7 usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename]
8*/ 8*/
9 9
10#define BZ_IMPORT 10#define BZ_IMPORT
11#include <stdio.h> 11#include <stdio.h>
12#include <stdlib.h> 12#include <stdlib.h>
13#include "bzlib.h" 13#include "bzlib.h"
14#ifdef _WIN32 14#ifdef _WIN32
15#include <io.h> 15#include <io.h>
16#endif 16#endif
17 17
18 18
19#ifdef _WIN32 19#ifdef _WIN32
20 20
21#define BZ2_LIBNAME "libbz2-1.0.2.DLL" 21#define BZ2_LIBNAME "libbz2-1.0.2.DLL"
22 22
23#include <windows.h> 23#include <windows.h>
24static int BZ2DLLLoaded = 0; 24static int BZ2DLLLoaded = 0;
25static HINSTANCE BZ2DLLhLib; 25static HINSTANCE BZ2DLLhLib;
26int BZ2DLLLoadLibrary(void) 26int BZ2DLLLoadLibrary(void)
27{ 27{
28 HINSTANCE hLib; 28 HINSTANCE hLib;
29 29
30 if(BZ2DLLLoaded==1){return 0;} 30 if(BZ2DLLLoaded==1){return 0;}
31 hLib=LoadLibrary(BZ2_LIBNAME); 31 hLib=LoadLibrary(BZ2_LIBNAME);
32 if(hLib == NULL){ 32 if(hLib == NULL){
33 fprintf(stderr,"Can't load %s\n",BZ2_LIBNAME); 33 fprintf(stderr,"Can't load %s\n",BZ2_LIBNAME);
34 return -1; 34 return -1;
35 } 35 }
36 BZ2_bzlibVersion=GetProcAddress(hLib,"BZ2_bzlibVersion"); 36 BZ2_bzlibVersion=GetProcAddress(hLib,"BZ2_bzlibVersion");
37 BZ2_bzopen=GetProcAddress(hLib,"BZ2_bzopen"); 37 BZ2_bzopen=GetProcAddress(hLib,"BZ2_bzopen");
38 BZ2_bzdopen=GetProcAddress(hLib,"BZ2_bzdopen"); 38 BZ2_bzdopen=GetProcAddress(hLib,"BZ2_bzdopen");
39 BZ2_bzread=GetProcAddress(hLib,"BZ2_bzread"); 39 BZ2_bzread=GetProcAddress(hLib,"BZ2_bzread");
40 BZ2_bzwrite=GetProcAddress(hLib,"BZ2_bzwrite"); 40 BZ2_bzwrite=GetProcAddress(hLib,"BZ2_bzwrite");
41 BZ2_bzflush=GetProcAddress(hLib,"BZ2_bzflush"); 41 BZ2_bzflush=GetProcAddress(hLib,"BZ2_bzflush");
42 BZ2_bzclose=GetProcAddress(hLib,"BZ2_bzclose"); 42 BZ2_bzclose=GetProcAddress(hLib,"BZ2_bzclose");
43 BZ2_bzerror=GetProcAddress(hLib,"BZ2_bzerror"); 43 BZ2_bzerror=GetProcAddress(hLib,"BZ2_bzerror");
44 44
45 if (!BZ2_bzlibVersion || !BZ2_bzopen || !BZ2_bzdopen 45 if (!BZ2_bzlibVersion || !BZ2_bzopen || !BZ2_bzdopen
46 || !BZ2_bzread || !BZ2_bzwrite || !BZ2_bzflush 46 || !BZ2_bzread || !BZ2_bzwrite || !BZ2_bzflush
47 || !BZ2_bzclose || !BZ2_bzerror) { 47 || !BZ2_bzclose || !BZ2_bzerror) {
48 fprintf(stderr,"GetProcAddress failed.\n"); 48 fprintf(stderr,"GetProcAddress failed.\n");
49 return -1; 49 return -1;
50 } 50 }
51 BZ2DLLLoaded=1; 51 BZ2DLLLoaded=1;
52 BZ2DLLhLib=hLib; 52 BZ2DLLhLib=hLib;
53 return 0; 53 return 0;
54 54
55} 55}
56int BZ2DLLFreeLibrary(void) 56int BZ2DLLFreeLibrary(void)
57{ 57{
58 if(BZ2DLLLoaded==0){return 0;} 58 if(BZ2DLLLoaded==0){return 0;}
59 FreeLibrary(BZ2DLLhLib); 59 FreeLibrary(BZ2DLLhLib);
60 BZ2DLLLoaded=0; 60 BZ2DLLLoaded=0;
61} 61}
62#endif /* WIN32 */ 62#endif /* WIN32 */
63 63
64void usage(void) 64void usage(void)
65{ 65{
66 puts("usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename]"); 66 puts("usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename]");
67} 67}
68 68
69int main(int argc,char *argv[]) 69int main(int argc,char *argv[])
70{ 70{
71 int decompress = 0; 71 int decompress = 0;
72 int level = 9; 72 int level = 9;
73 char *fn_r = NULL; 73 char *fn_r = NULL;
74 char *fn_w = NULL; 74 char *fn_w = NULL;
75 75
76#ifdef _WIN32 76#ifdef _WIN32
77 if(BZ2DLLLoadLibrary()<0){ 77 if(BZ2DLLLoadLibrary()<0){
78 fprintf(stderr,"Loading of %s failed. Giving up.\n", BZ2_LIBNAME); 78 fprintf(stderr,"Loading of %s failed. Giving up.\n", BZ2_LIBNAME);
79 exit(1); 79 exit(1);
80 } 80 }
81 printf("Loading of %s succeeded. Library version is %s.\n", 81 printf("Loading of %s succeeded. Library version is %s.\n",
82 BZ2_LIBNAME, BZ2_bzlibVersion() ); 82 BZ2_LIBNAME, BZ2_bzlibVersion() );
83#endif 83#endif
84 while(++argv,--argc){ 84 while(++argv,--argc){
85 if(**argv =='-' || **argv=='/'){ 85 if(**argv =='-' || **argv=='/'){
86 char *p; 86 char *p;
87 87
88 for(p=*argv+1;*p;p++){ 88 for(p=*argv+1;*p;p++){
89 if(*p=='d'){ 89 if(*p=='d'){
90 decompress = 1; 90 decompress = 1;
91 }else if('1'<=*p && *p<='9'){ 91 }else if('1'<=*p && *p<='9'){
92 level = *p - '0'; 92 level = *p - '0';
93 }else{ 93 }else{
94 usage(); 94 usage();
95 exit(1); 95 exit(1);
96 } 96 }
97 } 97 }
98 }else{ 98 }else{
99 break; 99 break;
100 } 100 }
101 } 101 }
102 if(argc>=1){ 102 if(argc>=1){
103 fn_r = *argv; 103 fn_r = *argv;
104 argc--;argv++; 104 argc--;argv++;
105 }else{ 105 }else{
106 fn_r = NULL; 106 fn_r = NULL;
107 } 107 }
108 if(argc>=1){ 108 if(argc>=1){
109 fn_w = *argv; 109 fn_w = *argv;
110 argc--;argv++; 110 argc--;argv++;
111 }else{ 111 }else{
112 fn_w = NULL; 112 fn_w = NULL;
113 } 113 }
114 { 114 {
115 int len; 115 int len;
116 char buff[0x1000]; 116 char buff[0x1000];
117 char mode[10]; 117 char mode[10];
118 118
119 if(decompress){ 119 if(decompress){
120 BZFILE *BZ2fp_r = NULL; 120 BZFILE *BZ2fp_r = NULL;
121 FILE *fp_w = NULL; 121 FILE *fp_w = NULL;
122 122
123 if(fn_w){ 123 if(fn_w){
124 if((fp_w = fopen(fn_w,"wb"))==NULL){ 124 if((fp_w = fopen(fn_w,"wb"))==NULL){
125 printf("can't open [%s]\n",fn_w); 125 printf("can't open [%s]\n",fn_w);
126 perror("reason:"); 126 perror("reason:");
127 exit(1); 127 exit(1);
128 } 128 }
129 }else{ 129 }else{
130 fp_w = stdout; 130 fp_w = stdout;
131 } 131 }
132 if((fn_r == NULL && (BZ2fp_r = BZ2_bzdopen(fileno(stdin),"rb"))==NULL) 132 if((fn_r == NULL && (BZ2fp_r = BZ2_bzdopen(fileno(stdin),"rb"))==NULL)
133 || (fn_r != NULL && (BZ2fp_r = BZ2_bzopen(fn_r,"rb"))==NULL)){ 133 || (fn_r != NULL && (BZ2fp_r = BZ2_bzopen(fn_r,"rb"))==NULL)){
134 printf("can't bz2openstream\n"); 134 printf("can't bz2openstream\n");
135 exit(1); 135 exit(1);
136 } 136 }
137 while((len=BZ2_bzread(BZ2fp_r,buff,0x1000))>0){ 137 while((len=BZ2_bzread(BZ2fp_r,buff,0x1000))>0){
138 fwrite(buff,1,len,fp_w); 138 fwrite(buff,1,len,fp_w);
139 } 139 }
140 BZ2_bzclose(BZ2fp_r); 140 BZ2_bzclose(BZ2fp_r);
141 if(fp_w != stdout) fclose(fp_w); 141 if(fp_w != stdout) fclose(fp_w);
142 }else{ 142 }else{
143 BZFILE *BZ2fp_w = NULL; 143 BZFILE *BZ2fp_w = NULL;
144 FILE *fp_r = NULL; 144 FILE *fp_r = NULL;
145 145
146 if(fn_r){ 146 if(fn_r){
147 if((fp_r = fopen(fn_r,"rb"))==NULL){ 147 if((fp_r = fopen(fn_r,"rb"))==NULL){
148 printf("can't open [%s]\n",fn_r); 148 printf("can't open [%s]\n",fn_r);
149 perror("reason:"); 149 perror("reason:");
150 exit(1); 150 exit(1);
151 } 151 }
152 }else{ 152 }else{
153 fp_r = stdin; 153 fp_r = stdin;
154 } 154 }
155 mode[0]='w'; 155 mode[0]='w';
156 mode[1] = '0' + level; 156 mode[1] = '0' + level;
157 mode[2] = '\0'; 157 mode[2] = '\0';
158 158
159 if((fn_w == NULL && (BZ2fp_w = BZ2_bzdopen(fileno(stdout),mode))==NULL) 159 if((fn_w == NULL && (BZ2fp_w = BZ2_bzdopen(fileno(stdout),mode))==NULL)
160 || (fn_w !=NULL && (BZ2fp_w = BZ2_bzopen(fn_w,mode))==NULL)){ 160 || (fn_w !=NULL && (BZ2fp_w = BZ2_bzopen(fn_w,mode))==NULL)){
161 printf("can't bz2openstream\n"); 161 printf("can't bz2openstream\n");
162 exit(1); 162 exit(1);
163 } 163 }
164 while((len=fread(buff,1,0x1000,fp_r))>0){ 164 while((len=fread(buff,1,0x1000,fp_r))>0){
165 BZ2_bzwrite(BZ2fp_w,buff,len); 165 BZ2_bzwrite(BZ2fp_w,buff,len);
166 } 166 }
167 BZ2_bzclose(BZ2fp_w); 167 BZ2_bzclose(BZ2fp_w);
168 if(fp_r!=stdin)fclose(fp_r); 168 if(fp_r!=stdin)fclose(fp_r);
169 } 169 }
170 } 170 }
171#ifdef _WIN32 171#ifdef _WIN32
172 BZ2DLLFreeLibrary(); 172 BZ2DLLFreeLibrary();
173#endif 173#endif
174 return 0; 174 return 0;
175} 175}
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/bzip2/dlltest.dsp b/libraries/irrlicht-1.8/source/Irrlicht/bzip2/dlltest.dsp
index 4b1615e..04819a4 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/bzip2/dlltest.dsp
+++ b/libraries/irrlicht-1.8/source/Irrlicht/bzip2/dlltest.dsp
@@ -1,93 +1,93 @@
1# Microsoft Developer Studio Project File - Name="dlltest" - Package Owner=<4> 1# Microsoft Developer Studio Project File - Name="dlltest" - Package Owner=<4>
2# Microsoft Developer Studio Generated Build File, Format Version 5.00 2# Microsoft Developer Studio Generated Build File, Format Version 5.00
3# ** •ÒW‚µ‚È‚¢‚Å‚­‚¾‚³‚¢ ** 3# ** •ÒW‚µ‚È‚¢‚Å‚­‚¾‚³‚¢ **
4 4
5# TARGTYPE "Win32 (x86) Console Application" 0x0103 5# TARGTYPE "Win32 (x86) Console Application" 0x0103
6 6
7CFG=dlltest - Win32 Debug 7CFG=dlltest - Win32 Debug
8!MESSAGE ‚±‚ê‚Í—LŒø‚ÈÒ²¸Ì§²Ù‚Å‚Í‚ ‚è‚Ü‚¹‚ñB ‚±‚ÌÌßÛ¼Þª¸Ä‚ðËÞÙÄÞ‚·‚邽‚ß‚É‚Í NMAKE ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B 8!MESSAGE ‚±‚ê‚Í—LŒø‚ÈÒ²¸Ì§²Ù‚Å‚Í‚ ‚è‚Ü‚¹‚ñB ‚±‚ÌÌßÛ¼Þª¸Ä‚ðËÞÙÄÞ‚·‚邽‚ß‚É‚Í NMAKE ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B
9!MESSAGE [Ò²¸Ì§²Ù‚Ì´¸½Îß°Ä] ºÏÝÄÞ‚ðŽg—p‚µ‚ÄŽÀs‚µ‚Ä‚­‚¾‚³‚¢ 9!MESSAGE [Ò²¸Ì§²Ù‚Ì´¸½Îß°Ä] ºÏÝÄÞ‚ðŽg—p‚µ‚ÄŽÀs‚µ‚Ä‚­‚¾‚³‚¢
10!MESSAGE 10!MESSAGE
11!MESSAGE NMAKE /f "dlltest.mak". 11!MESSAGE NMAKE /f "dlltest.mak".
12!MESSAGE 12!MESSAGE
13!MESSAGE NMAKE ‚ÌŽÀsŽž‚É\¬‚ðŽw’è‚Å‚«‚Ü‚· 13!MESSAGE NMAKE ‚ÌŽÀsŽž‚É\¬‚ðŽw’è‚Å‚«‚Ü‚·
14!MESSAGE ºÏÝÄÞ ×²Ýã‚ÅϸۂÌÝ’è‚ð’è‹`‚µ‚Ü‚·B—á: 14!MESSAGE ºÏÝÄÞ ×²Ýã‚ÅϸۂÌÝ’è‚ð’è‹`‚µ‚Ü‚·B—á:
15!MESSAGE 15!MESSAGE
16!MESSAGE NMAKE /f "dlltest.mak" CFG="dlltest - Win32 Debug" 16!MESSAGE NMAKE /f "dlltest.mak" CFG="dlltest - Win32 Debug"
17!MESSAGE 17!MESSAGE
18!MESSAGE ‘I‘ð‰Â”\‚ÈËÞÙÄÞ Ó°ÄÞ: 18!MESSAGE ‘I‘ð‰Â”\‚ÈËÞÙÄÞ Ó°ÄÞ:
19!MESSAGE 19!MESSAGE
20!MESSAGE "dlltest - Win32 Release" ("Win32 (x86) Console Application" —p) 20!MESSAGE "dlltest - Win32 Release" ("Win32 (x86) Console Application" —p)
21!MESSAGE "dlltest - Win32 Debug" ("Win32 (x86) Console Application" —p) 21!MESSAGE "dlltest - Win32 Debug" ("Win32 (x86) Console Application" —p)
22!MESSAGE 22!MESSAGE
23 23
24# Begin Project 24# Begin Project
25# PROP Scc_ProjName "" 25# PROP Scc_ProjName ""
26# PROP Scc_LocalPath "" 26# PROP Scc_LocalPath ""
27CPP=cl.exe 27CPP=cl.exe
28RSC=rc.exe 28RSC=rc.exe
29 29
30!IF "$(CFG)" == "dlltest - Win32 Release" 30!IF "$(CFG)" == "dlltest - Win32 Release"
31 31
32# PROP BASE Use_MFC 0 32# PROP BASE Use_MFC 0
33# PROP BASE Use_Debug_Libraries 0 33# PROP BASE Use_Debug_Libraries 0
34# PROP BASE Output_Dir "Release" 34# PROP BASE Output_Dir "Release"
35# PROP BASE Intermediate_Dir "Release" 35# PROP BASE Intermediate_Dir "Release"
36# PROP BASE Target_Dir "" 36# PROP BASE Target_Dir ""
37# PROP Use_MFC 0 37# PROP Use_MFC 0
38# PROP Use_Debug_Libraries 0 38# PROP Use_Debug_Libraries 0
39# PROP Output_Dir "Release" 39# PROP Output_Dir "Release"
40# PROP Intermediate_Dir "Release" 40# PROP Intermediate_Dir "Release"
41# PROP Ignore_Export_Lib 0 41# PROP Ignore_Export_Lib 0
42# PROP Target_Dir "" 42# PROP Target_Dir ""
43# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c 43# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
44# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c 44# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
45# ADD BASE RSC /l 0x411 /d "NDEBUG" 45# ADD BASE RSC /l 0x411 /d "NDEBUG"
46# ADD RSC /l 0x411 /d "NDEBUG" 46# ADD RSC /l 0x411 /d "NDEBUG"
47BSC32=bscmake.exe 47BSC32=bscmake.exe
48# ADD BASE BSC32 /nologo 48# ADD BASE BSC32 /nologo
49# ADD BSC32 /nologo 49# ADD BSC32 /nologo
50LINK32=link.exe 50LINK32=link.exe
51# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 51# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
52# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"minibz2.exe" 52# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"minibz2.exe"
53 53
54!ELSEIF "$(CFG)" == "dlltest - Win32 Debug" 54!ELSEIF "$(CFG)" == "dlltest - Win32 Debug"
55 55
56# PROP BASE Use_MFC 0 56# PROP BASE Use_MFC 0
57# PROP BASE Use_Debug_Libraries 1 57# PROP BASE Use_Debug_Libraries 1
58# PROP BASE Output_Dir "dlltest_" 58# PROP BASE Output_Dir "dlltest_"
59# PROP BASE Intermediate_Dir "dlltest_" 59# PROP BASE Intermediate_Dir "dlltest_"
60# PROP BASE Target_Dir "" 60# PROP BASE Target_Dir ""
61# PROP Use_MFC 0 61# PROP Use_MFC 0
62# PROP Use_Debug_Libraries 1 62# PROP Use_Debug_Libraries 1
63# PROP Output_Dir "dlltest_" 63# PROP Output_Dir "dlltest_"
64# PROP Intermediate_Dir "dlltest_" 64# PROP Intermediate_Dir "dlltest_"
65# PROP Ignore_Export_Lib 0 65# PROP Ignore_Export_Lib 0
66# PROP Target_Dir "" 66# PROP Target_Dir ""
67# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c 67# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
68# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c 68# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
69# ADD BASE RSC /l 0x411 /d "_DEBUG" 69# ADD BASE RSC /l 0x411 /d "_DEBUG"
70# ADD RSC /l 0x411 /d "_DEBUG" 70# ADD RSC /l 0x411 /d "_DEBUG"
71BSC32=bscmake.exe 71BSC32=bscmake.exe
72# ADD BASE BSC32 /nologo 72# ADD BASE BSC32 /nologo
73# ADD BSC32 /nologo 73# ADD BSC32 /nologo
74LINK32=link.exe 74LINK32=link.exe
75# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept 75# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
76# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"minibz2.exe" /pdbtype:sept 76# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"minibz2.exe" /pdbtype:sept
77 77
78!ENDIF 78!ENDIF
79 79
80# Begin Target 80# Begin Target
81 81
82# Name "dlltest - Win32 Release" 82# Name "dlltest - Win32 Release"
83# Name "dlltest - Win32 Debug" 83# Name "dlltest - Win32 Debug"
84# Begin Source File 84# Begin Source File
85 85
86SOURCE=.\bzlib.h 86SOURCE=.\bzlib.h
87# End Source File 87# End Source File
88# Begin Source File 88# Begin Source File
89 89
90SOURCE=.\dlltest.c 90SOURCE=.\dlltest.c
91# End Source File 91# End Source File
92# End Target 92# End Target
93# End Project 93# End Project
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/bzip2/libbz2.def b/libraries/irrlicht-1.8/source/Irrlicht/bzip2/libbz2.def
index 2dc0dd8..4f83fcc 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/bzip2/libbz2.def
+++ b/libraries/irrlicht-1.8/source/Irrlicht/bzip2/libbz2.def
@@ -1,27 +1,27 @@
1LIBRARY LIBBZ2 1LIBRARY LIBBZ2
2DESCRIPTION "libbzip2: library for data compression" 2DESCRIPTION "libbzip2: library for data compression"
3EXPORTS 3EXPORTS
4 BZ2_bzCompressInit 4 BZ2_bzCompressInit
5 BZ2_bzCompress 5 BZ2_bzCompress
6 BZ2_bzCompressEnd 6 BZ2_bzCompressEnd
7 BZ2_bzDecompressInit 7 BZ2_bzDecompressInit
8 BZ2_bzDecompress 8 BZ2_bzDecompress
9 BZ2_bzDecompressEnd 9 BZ2_bzDecompressEnd
10 BZ2_bzReadOpen 10 BZ2_bzReadOpen
11 BZ2_bzReadClose 11 BZ2_bzReadClose
12 BZ2_bzReadGetUnused 12 BZ2_bzReadGetUnused
13 BZ2_bzRead 13 BZ2_bzRead
14 BZ2_bzWriteOpen 14 BZ2_bzWriteOpen
15 BZ2_bzWrite 15 BZ2_bzWrite
16 BZ2_bzWriteClose 16 BZ2_bzWriteClose
17 BZ2_bzWriteClose64 17 BZ2_bzWriteClose64
18 BZ2_bzBuffToBuffCompress 18 BZ2_bzBuffToBuffCompress
19 BZ2_bzBuffToBuffDecompress 19 BZ2_bzBuffToBuffDecompress
20 BZ2_bzlibVersion 20 BZ2_bzlibVersion
21 BZ2_bzopen 21 BZ2_bzopen
22 BZ2_bzdopen 22 BZ2_bzdopen
23 BZ2_bzread 23 BZ2_bzread
24 BZ2_bzwrite 24 BZ2_bzwrite
25 BZ2_bzflush 25 BZ2_bzflush
26 BZ2_bzclose 26 BZ2_bzclose
27 BZ2_bzerror 27 BZ2_bzerror
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/bzip2/libbz2.dsp b/libraries/irrlicht-1.8/source/Irrlicht/bzip2/libbz2.dsp
index a21a20f..06c1d37 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/bzip2/libbz2.dsp
+++ b/libraries/irrlicht-1.8/source/Irrlicht/bzip2/libbz2.dsp
@@ -1,130 +1,130 @@
1# Microsoft Developer Studio Project File - Name="libbz2" - Package Owner=<4> 1# Microsoft Developer Studio Project File - Name="libbz2" - Package Owner=<4>
2# Microsoft Developer Studio Generated Build File, Format Version 5.00 2# Microsoft Developer Studio Generated Build File, Format Version 5.00
3# ** •ÒW‚µ‚È‚¢‚Å‚­‚¾‚³‚¢ ** 3# ** •ÒW‚µ‚È‚¢‚Å‚­‚¾‚³‚¢ **
4 4
5# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 5# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
6 6
7CFG=libbz2 - Win32 Debug 7CFG=libbz2 - Win32 Debug
8!MESSAGE ‚±‚ê‚Í—LŒø‚ÈÒ²¸Ì§²Ù‚Å‚Í‚ ‚è‚Ü‚¹‚ñB ‚±‚ÌÌßÛ¼Þª¸Ä‚ðËÞÙÄÞ‚·‚邽‚ß‚É‚Í NMAKE ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B 8!MESSAGE ‚±‚ê‚Í—LŒø‚ÈÒ²¸Ì§²Ù‚Å‚Í‚ ‚è‚Ü‚¹‚ñB ‚±‚ÌÌßÛ¼Þª¸Ä‚ðËÞÙÄÞ‚·‚邽‚ß‚É‚Í NMAKE ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B
9!MESSAGE [Ò²¸Ì§²Ù‚Ì´¸½Îß°Ä] ºÏÝÄÞ‚ðŽg—p‚µ‚ÄŽÀs‚µ‚Ä‚­‚¾‚³‚¢ 9!MESSAGE [Ò²¸Ì§²Ù‚Ì´¸½Îß°Ä] ºÏÝÄÞ‚ðŽg—p‚µ‚ÄŽÀs‚µ‚Ä‚­‚¾‚³‚¢
10!MESSAGE 10!MESSAGE
11!MESSAGE NMAKE /f "libbz2.mak". 11!MESSAGE NMAKE /f "libbz2.mak".
12!MESSAGE 12!MESSAGE
13!MESSAGE NMAKE ‚ÌŽÀsŽž‚É\¬‚ðŽw’è‚Å‚«‚Ü‚· 13!MESSAGE NMAKE ‚ÌŽÀsŽž‚É\¬‚ðŽw’è‚Å‚«‚Ü‚·
14!MESSAGE ºÏÝÄÞ ×²Ýã‚ÅϸۂÌÝ’è‚ð’è‹`‚µ‚Ü‚·B—á: 14!MESSAGE ºÏÝÄÞ ×²Ýã‚ÅϸۂÌÝ’è‚ð’è‹`‚µ‚Ü‚·B—á:
15!MESSAGE 15!MESSAGE
16!MESSAGE NMAKE /f "libbz2.mak" CFG="libbz2 - Win32 Debug" 16!MESSAGE NMAKE /f "libbz2.mak" CFG="libbz2 - Win32 Debug"
17!MESSAGE 17!MESSAGE
18!MESSAGE ‘I‘ð‰Â”\‚ÈËÞÙÄÞ Ó°ÄÞ: 18!MESSAGE ‘I‘ð‰Â”\‚ÈËÞÙÄÞ Ó°ÄÞ:
19!MESSAGE 19!MESSAGE
20!MESSAGE "libbz2 - Win32 Release" ("Win32 (x86) Dynamic-Link Library" —p) 20!MESSAGE "libbz2 - Win32 Release" ("Win32 (x86) Dynamic-Link Library" —p)
21!MESSAGE "libbz2 - Win32 Debug" ("Win32 (x86) Dynamic-Link Library" —p) 21!MESSAGE "libbz2 - Win32 Debug" ("Win32 (x86) Dynamic-Link Library" —p)
22!MESSAGE 22!MESSAGE
23 23
24# Begin Project 24# Begin Project
25# PROP Scc_ProjName "" 25# PROP Scc_ProjName ""
26# PROP Scc_LocalPath "" 26# PROP Scc_LocalPath ""
27CPP=cl.exe 27CPP=cl.exe
28MTL=midl.exe 28MTL=midl.exe
29RSC=rc.exe 29RSC=rc.exe
30 30
31!IF "$(CFG)" == "libbz2 - Win32 Release" 31!IF "$(CFG)" == "libbz2 - Win32 Release"
32 32
33# PROP BASE Use_MFC 0 33# PROP BASE Use_MFC 0
34# PROP BASE Use_Debug_Libraries 0 34# PROP BASE Use_Debug_Libraries 0
35# PROP BASE Output_Dir "Release" 35# PROP BASE Output_Dir "Release"
36# PROP BASE Intermediate_Dir "Release" 36# PROP BASE Intermediate_Dir "Release"
37# PROP BASE Target_Dir "" 37# PROP BASE Target_Dir ""
38# PROP Use_MFC 0 38# PROP Use_MFC 0
39# PROP Use_Debug_Libraries 0 39# PROP Use_Debug_Libraries 0
40# PROP Output_Dir "Release" 40# PROP Output_Dir "Release"
41# PROP Intermediate_Dir "Release" 41# PROP Intermediate_Dir "Release"
42# PROP Ignore_Export_Lib 0 42# PROP Ignore_Export_Lib 0
43# PROP Target_Dir "" 43# PROP Target_Dir ""
44# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c 44# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
45# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c 45# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
46# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 46# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
47# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 47# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
48# ADD BASE RSC /l 0x411 /d "NDEBUG" 48# ADD BASE RSC /l 0x411 /d "NDEBUG"
49# ADD RSC /l 0x411 /d "NDEBUG" 49# ADD RSC /l 0x411 /d "NDEBUG"
50BSC32=bscmake.exe 50BSC32=bscmake.exe
51# ADD BASE BSC32 /nologo 51# ADD BASE BSC32 /nologo
52# ADD BSC32 /nologo 52# ADD BSC32 /nologo
53LINK32=link.exe 53LINK32=link.exe
54# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 54# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
55# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"libbz2.dll" 55# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"libbz2.dll"
56 56
57!ELSEIF "$(CFG)" == "libbz2 - Win32 Debug" 57!ELSEIF "$(CFG)" == "libbz2 - Win32 Debug"
58 58
59# PROP BASE Use_MFC 0 59# PROP BASE Use_MFC 0
60# PROP BASE Use_Debug_Libraries 1 60# PROP BASE Use_Debug_Libraries 1
61# PROP BASE Output_Dir "Debug" 61# PROP BASE Output_Dir "Debug"
62# PROP BASE Intermediate_Dir "Debug" 62# PROP BASE Intermediate_Dir "Debug"
63# PROP BASE Target_Dir "" 63# PROP BASE Target_Dir ""
64# PROP Use_MFC 0 64# PROP Use_MFC 0
65# PROP Use_Debug_Libraries 1 65# PROP Use_Debug_Libraries 1
66# PROP Output_Dir "Debug" 66# PROP Output_Dir "Debug"
67# PROP Intermediate_Dir "Debug" 67# PROP Intermediate_Dir "Debug"
68# PROP Ignore_Export_Lib 0 68# PROP Ignore_Export_Lib 0
69# PROP Target_Dir "" 69# PROP Target_Dir ""
70# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c 70# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
71# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c 71# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
72# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 72# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
73# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 73# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
74# ADD BASE RSC /l 0x411 /d "_DEBUG" 74# ADD BASE RSC /l 0x411 /d "_DEBUG"
75# ADD RSC /l 0x411 /d "_DEBUG" 75# ADD RSC /l 0x411 /d "_DEBUG"
76BSC32=bscmake.exe 76BSC32=bscmake.exe
77# ADD BASE BSC32 /nologo 77# ADD BASE BSC32 /nologo
78# ADD BSC32 /nologo 78# ADD BSC32 /nologo
79LINK32=link.exe 79LINK32=link.exe
80# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept 80# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
81# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"libbz2.dll" /pdbtype:sept 81# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"libbz2.dll" /pdbtype:sept
82 82
83!ENDIF 83!ENDIF
84 84
85# Begin Target 85# Begin Target
86 86
87# Name "libbz2 - Win32 Release" 87# Name "libbz2 - Win32 Release"
88# Name "libbz2 - Win32 Debug" 88# Name "libbz2 - Win32 Debug"
89# Begin Source File 89# Begin Source File
90 90
91SOURCE=.\blocksort.c 91SOURCE=.\blocksort.c
92# End Source File 92# End Source File
93# Begin Source File 93# Begin Source File
94 94
95SOURCE=.\bzlib.c 95SOURCE=.\bzlib.c
96# End Source File 96# End Source File
97# Begin Source File 97# Begin Source File
98 98
99SOURCE=.\bzlib.h 99SOURCE=.\bzlib.h
100# End Source File 100# End Source File
101# Begin Source File 101# Begin Source File
102 102
103SOURCE=.\bzlib_private.h 103SOURCE=.\bzlib_private.h
104# End Source File 104# End Source File
105# Begin Source File 105# Begin Source File
106 106
107SOURCE=.\compress.c 107SOURCE=.\compress.c
108# End Source File 108# End Source File
109# Begin Source File 109# Begin Source File
110 110
111SOURCE=.\crctable.c 111SOURCE=.\crctable.c
112# End Source File 112# End Source File
113# Begin Source File 113# Begin Source File
114 114
115SOURCE=.\decompress.c 115SOURCE=.\decompress.c
116# End Source File 116# End Source File
117# Begin Source File 117# Begin Source File
118 118
119SOURCE=.\huffman.c 119SOURCE=.\huffman.c
120# End Source File 120# End Source File
121# Begin Source File 121# Begin Source File
122 122
123SOURCE=.\libbz2.def 123SOURCE=.\libbz2.def
124# End Source File 124# End Source File
125# Begin Source File 125# Begin Source File
126 126
127SOURCE=.\randtable.c 127SOURCE=.\randtable.c
128# End Source File 128# End Source File
129# End Target 129# End Target
130# End Project 130# End Project
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/bzip2/makefile.msc b/libraries/irrlicht-1.8/source/Irrlicht/bzip2/makefile.msc
index 799a18a..6a628a7 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/bzip2/makefile.msc
+++ b/libraries/irrlicht-1.8/source/Irrlicht/bzip2/makefile.msc
@@ -1,63 +1,63 @@
1# Makefile for Microsoft Visual C++ 6.0 1# Makefile for Microsoft Visual C++ 6.0
2# usage: nmake -f makefile.msc 2# usage: nmake -f makefile.msc
3# K.M. Syring (syring@gsf.de) 3# K.M. Syring (syring@gsf.de)
4# Fixed up by JRS for bzip2-0.9.5d release. 4# Fixed up by JRS for bzip2-0.9.5d release.
5 5
6CC=cl 6CC=cl
7CFLAGS= -DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64 -nologo 7CFLAGS= -DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64 -nologo
8 8
9OBJS= blocksort.obj \ 9OBJS= blocksort.obj \
10 huffman.obj \ 10 huffman.obj \
11 crctable.obj \ 11 crctable.obj \
12 randtable.obj \ 12 randtable.obj \
13 compress.obj \ 13 compress.obj \
14 decompress.obj \ 14 decompress.obj \
15 bzlib.obj 15 bzlib.obj
16 16
17all: lib bzip2 test 17all: lib bzip2 test
18 18
19bzip2: lib 19bzip2: lib
20 $(CC) $(CFLAGS) -o bzip2 bzip2.c libbz2.lib setargv.obj 20 $(CC) $(CFLAGS) -o bzip2 bzip2.c libbz2.lib setargv.obj
21 $(CC) $(CFLAGS) -o bzip2recover bzip2recover.c 21 $(CC) $(CFLAGS) -o bzip2recover bzip2recover.c
22 22
23lib: $(OBJS) 23lib: $(OBJS)
24 lib /out:libbz2.lib $(OBJS) 24 lib /out:libbz2.lib $(OBJS)
25 25
26test: bzip2 26test: bzip2
27 type words1 27 type words1
28 .\\bzip2 -1 < sample1.ref > sample1.rb2 28 .\\bzip2 -1 < sample1.ref > sample1.rb2
29 .\\bzip2 -2 < sample2.ref > sample2.rb2 29 .\\bzip2 -2 < sample2.ref > sample2.rb2
30 .\\bzip2 -3 < sample3.ref > sample3.rb2 30 .\\bzip2 -3 < sample3.ref > sample3.rb2
31 .\\bzip2 -d < sample1.bz2 > sample1.tst 31 .\\bzip2 -d < sample1.bz2 > sample1.tst
32 .\\bzip2 -d < sample2.bz2 > sample2.tst 32 .\\bzip2 -d < sample2.bz2 > sample2.tst
33 .\\bzip2 -ds < sample3.bz2 > sample3.tst 33 .\\bzip2 -ds < sample3.bz2 > sample3.tst
34 @echo All six of the fc's should find no differences. 34 @echo All six of the fc's should find no differences.
35 @echo If fc finds an error on sample3.bz2, this could be 35 @echo If fc finds an error on sample3.bz2, this could be
36 @echo because WinZip's 'TAR file smart CR/LF conversion' 36 @echo because WinZip's 'TAR file smart CR/LF conversion'
37 @echo is too clever for its own good. Disable this option. 37 @echo is too clever for its own good. Disable this option.
38 @echo The correct size for sample3.ref is 120,244. If it 38 @echo The correct size for sample3.ref is 120,244. If it
39 @echo is 150,251, WinZip has messed it up. 39 @echo is 150,251, WinZip has messed it up.
40 fc sample1.bz2 sample1.rb2 40 fc sample1.bz2 sample1.rb2
41 fc sample2.bz2 sample2.rb2 41 fc sample2.bz2 sample2.rb2
42 fc sample3.bz2 sample3.rb2 42 fc sample3.bz2 sample3.rb2
43 fc sample1.tst sample1.ref 43 fc sample1.tst sample1.ref
44 fc sample2.tst sample2.ref 44 fc sample2.tst sample2.ref
45 fc sample3.tst sample3.ref 45 fc sample3.tst sample3.ref
46 46
47 47
48 48
49clean: 49clean:
50 del *.obj 50 del *.obj
51 del libbz2.lib 51 del libbz2.lib
52 del bzip2.exe 52 del bzip2.exe
53 del bzip2recover.exe 53 del bzip2recover.exe
54 del sample1.rb2 54 del sample1.rb2
55 del sample2.rb2 55 del sample2.rb2
56 del sample3.rb2 56 del sample3.rb2
57 del sample1.tst 57 del sample1.tst
58 del sample2.tst 58 del sample2.tst
59 del sample3.tst 59 del sample3.tst
60 60
61.c.obj: 61.c.obj:
62 $(CC) $(CFLAGS) -c $*.c -o $*.obj 62 $(CC) $(CFLAGS) -c $*.c -o $*.obj
63 63