diff --git a/platforms/win32/winbareos-nsi.spec b/platforms/win32/winbareos-nsi.spec index 184c6e97d35..e3900dcf501 100644 --- a/platforms/win32/winbareos-nsi.spec +++ b/platforms/win32/winbareos-nsi.spec @@ -68,9 +68,9 @@ for file in \ bpipe-fd.dll libbareos.dll libbareosfind.dll \ libcrypto-8.dll libgcc_s_sjlj-1.dll libhistory6.dll \ libreadline6.dll libssl-8.dll libstdc++-6.dll \ - libtermcap-0.dll pthreadGCE2.dll zlib1.dll\ - QtCore4.dll QtGui4.dll liblzo2-2.dll libpng15-15.dll\ - openssl.exe sed.exe; do + libtermcap-0.dll pthreadGCE2.dll zlib1.dll \ + QtCore4.dll QtGui4.dll liblzo2-2.dll libfastlz.dll \ + libpng15-15.dll openssl.exe sed.exe; do cp %{_mingw32_bindir}/$file $RPM_BUILD_ROOT/release32 cp %{_mingw64_bindir}/$file $RPM_BUILD_ROOT/release64 done diff --git a/platforms/win32/winbareos.nsi b/platforms/win32/winbareos.nsi index d4a84b16bb4..a9089824dc5 100644 --- a/platforms/win32/winbareos.nsi +++ b/platforms/win32/winbareos.nsi @@ -269,6 +269,7 @@ SectionIn 1 2 3 File "pthreadGCE2.dll" File "zlib1.dll" File "liblzo2-2.dll" + File "libfastlz.dll" # for password generation File "openssl.exe" @@ -794,6 +795,7 @@ ConfDeleteSkip: Delete "$INSTDIR\QtCore4.dll" Delete "$INSTDIR\QtGui4.dll" Delete "$INSTDIR\liblzo2-2.dll" + Delete "$INSTDIR\libfastlz.dll" Delete "$INSTDIR\libpng15-15.dll" Delete "$INSTDIR\openssl.exe" Delete "$INSTDIR\sed.exe" diff --git a/platforms/win32/winbareos32.spec b/platforms/win32/winbareos32.spec index 1d3246cccfb..f23a9afd6d7 100644 --- a/platforms/win32/winbareos32.spec +++ b/platforms/win32/winbareos32.spec @@ -55,6 +55,8 @@ BuildRequires: mingw32-readline BuildRequires: mingw32-readline-devel BuildRequires: mingw32-lzo BuildRequires: mingw32-lzo-devel +BuildRequires: mingw32-libfastlz +BuildRequires: mingw32-libfastlz-devel BuildRequires: sed BuildRequires: vim, procps, bc @@ -84,7 +86,7 @@ tar xvf %SOURCE2 cd src/win32/ -make BUILD_QTGUI=yes %{?jobs:-j%jobs} +make BUILD_QTGUI=yes %{?jobs:-j%jobs} #make %{?jobs:-j%jobs} #make BUILD_QTGUI=yes WIN_VERSION=64 %{?jobs:-j%jobs} diff --git a/platforms/win32/winbareos64.spec b/platforms/win32/winbareos64.spec index dd3af3d4c09..ce6089d41ce 100644 --- a/platforms/win32/winbareos64.spec +++ b/platforms/win32/winbareos64.spec @@ -23,7 +23,6 @@ BuildArch: noarch Source1: fillup.sed Source2: vss_headers.tar - Patch1: tray-monitor-conf.patch BuildRequires: mingw64-filesystem @@ -56,6 +55,8 @@ BuildRequires: mingw64-readline BuildRequires: mingw64-readline-devel BuildRequires: mingw64-lzo BuildRequires: mingw64-lzo-devel +BuildRequires: mingw64-libfastlz +BuildRequires: mingw64-libfastlz-devel BuildRequires: sed BuildRequires: vim, procps, bc diff --git a/src/win32/compat/include/mingwconfig.h b/src/win32/compat/include/mingwconfig.h index 76a8b7b1005..a95cc627668 100644 --- a/src/win32/compat/include/mingwconfig.h +++ b/src/win32/compat/include/mingwconfig.h @@ -48,6 +48,10 @@ /* Define to 1 if you have the header file. */ #define HAVE_LZO_LZOCONF_H 1 +/* Define if you have fastlz lib */ +#define HAVE_FASTLZ 1 + + /* File daemon specif libraries */ #define FDLIBS 1 diff --git a/src/win32/filed/Makefile b/src/win32/filed/Makefile index d43fcfe066b..8ce8fea6cb9 100644 --- a/src/win32/filed/Makefile +++ b/src/win32/filed/Makefile @@ -27,6 +27,7 @@ LDLIBS = ../lib/libbareos.a \ $(MINGW_LIB)/libpthreadGCE2.a \ $(MINGW_LIB)/libz.dll.a \ $(MINGW_LIB)/liblzo2.dll.a \ + $(MINGW_LIB)/libfastlz.dll.a \ $(WINSOCKLIB) -lole32 -loleaut32 -luuid -lcomctl32 SVRSRCS = accurate.c authenticate.c backup.c compression.c \