diff --git a/Makefile.am b/Makefile.am index 3eaad556..bf49e70b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,7 @@ uninstall-hook: rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION) static: - rm -f src/testdisk src/testdisk.exe src/photorec src/photorec.exe src/fidentify src/fidentify.exe + rm -f src/testdisk src/testdisk.exe src/photorec src/photorec.exe src/fidentify src/fidentify.exe src/qphotorec src/qphotorec.exe $(MAKE) LDFLAGS="$(LDFLAGS) -static" LIBS="$(PTHREAD_LIBS) $(LIBS)" CFLAGS="$(PTHREAD_CFLAGS) $(CFLAGS)" CXXFLAGS="$(PTHREAD_CFLAGS) $(CXXFLAGS)" smallstatic: diff --git a/compile.sh b/compile.sh index 580f1c10..fa4e8777 100755 --- a/compile.sh +++ b/compile.sh @@ -38,7 +38,13 @@ case "$crosscompile_target" in VER_NTFSPROGS="2.0.0" VER_E2FSPROGS=1.41.8 ;; - *-cygwin|*-mingw32) + *-cygwin) + VER_LIBNTFS3G= + VER_NTFSPROGS="2.0.0" + VER_E2FSPROGS=1.42.2 + export PKG_CONFIG_SYSROOT_DIR=/usr/i386-pc-cygwin/ + ;; + *-mingw32) VER_LIBNTFS3G= VER_NTFSPROGS="2.0.0" VER_E2FSPROGS=1.42.2 @@ -314,7 +320,7 @@ then $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --without-ewf --without-iconv ;; i386-pc-cygwin) - $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT + $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --enable-qt ;; i386-mingw32) $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --without-iconv --enable-missing-uuid-ok