diff -ruN unrar.orig/consio.hpp unrar/consio.hpp --- unrar.orig/consio.hpp 2004-09-08 17:57:20.000000000 +0400 +++ unrar/consio.hpp 2004-10-22 10:43:08.000000000 +0400 @@ -21,12 +21,16 @@ void OutComment(char *Comment,int Size); #ifdef SILENT +/* inline void mprintf(const char *fmt,const char *a=NULL,const char *b=NULL) {} inline void eprintf(const char *fmt,const char *a=NULL,const char *b=NULL) {} inline void mprintf(const char *fmt,int b) {} inline void eprintf(const char *fmt,int b) {} inline void mprintf(const char *fmt,const char *a,int b) {} inline void eprintf(const char *fmt,const char *a,int b) {} +*/ +inline void mprintf(const char *fmt,...) {} +inline void eprintf(const char *fmt,...) {} inline void Alarm() {} inline void GetPasswordText(char *Str,int MaxLength) {} inline unsigned int GetKey() {return(0);} diff -ruN unrar.orig/dll.hpp unrar/dll.hpp --- unrar.orig/dll.hpp 2004-09-08 17:57:20.000000000 +0400 +++ unrar/dll.hpp 2004-10-22 10:43:08.000000000 +0400 @@ -26,13 +26,13 @@ #define RAR_DLL_VERSION 4 -#ifdef _UNIX +//#ifdef _UNIX #define CALLBACK #define PASCAL #define LONG long #define HANDLE void * #define UINT unsigned int -#endif +//#endif struct RARHeaderData { diff -ruN unrar.orig/makefile.unix unrar/makefile.unix --- unrar.orig/makefile.unix 2004-07-26 11:57:26.000000000 +0400 +++ unrar/makefile.unix 2004-10-22 10:44:09.000000000 +0400 @@ -7,9 +7,10 @@ # Linux using GCC CXX=g++ -CXXFLAGS=-O2 -DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +CXXFLAGS=-O2 -fPIC -DPIC +DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DGUI -DSILENT STRIP=strip +RANLIB=ranlib # Linux using LCC #CXX=lcc @@ -114,6 +115,12 @@ $(STRIP) default.sfx lib: WHAT=RARDLL -lib: $(OBJECTS) $(LIB_OBJ) - @rm -f libunrar.so - $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) +lib: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) + @rm -f libunrar3.so + $(LINK) -shared -o libunrar3.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) + +liba: WHAT=RARDLL +liba: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) + @rm -f libunrar3.a + $(AR) rc libunrar3.a $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) + $(RANLIB) libunrar3.a