More work trying to build with mingw; not succeeding

2 files changed, 48 insertions, 28 deletions

diff --git a/xdelta3/run_release.sh b/xdelta3/run_release.sh
index 0f86c27..de33020 100755
--- a/xdelta3/run_release.sh
+++ b/xdelta3/run_release.sh
@@ -9,6 +9,13 @@ export LDFLAGS
 
 LIBBASE=$HOME/lib
 
+MINGW_CCFLAGS="-DEXTERNAL_COMPRESSION=0 -DVCDIFF_TOOLS=0 -DXD3_WIN32=1 -DSHELL_TESTS=0"
+MINGW_LDFLAGS="-lmingw32"
+
+# Location where mingw-w64-build script runs.
+MINGW_BASE="/volume/home/jmacd/src/mingwb"
+
+# Windows 32bit
 # Run from the source dir.
 SRCDIR=$PWD
 
@@ -25,12 +32,13 @@ function buildit {
     host=$1
     march=$2
     offsetbits=$3
-    args=$4
+    cargs=$4
+    largs=$5
     BM="${host}${march}"
     D=build/$BM/xoff${offsetbits}
-    CFLAGS="$COMMON ${march} ${args} -I$LIBBASE/$BM/include"
-    CXXFLAGS="$COMMON ${march} ${args} -I$LIBBASE/$BM/include"
-    LDFLAGS="$COMMON ${march} ${args} -L$LIBBASE/$BM/lib"
+    CFLAGS="${COMMON} ${march} ${cargs} -I$LIBBASE/$BM/include"
+    CXXFLAGS="${COMMON} ${march} ${cargs} -I$LIBBASE/$BM/include"
+    LDFLAGS="${largs} -L$LIBBASE/$BM/lib"
     echo CFLAGS=$CFLAGS
     echo CXXFLAGS=$CXXFLAGS
     echo LDFLAGS=$LDFLAGS
@@ -43,26 +51,31 @@ function buildit {
                   --host=${host} \
                   --prefix=$PWD \
                   --enable-debug-symbols)
-    echo "Building $D ..."
-    (cd $D && make all)
-    echo "Installing $D ..."    
-    (cd $D && make install)
-    echo "Testing $D ..."
+
+    # echo "Building $D ..."
+    # (cd $D && make all)
+    # echo "Installing $D ..."    
+    # (cd $D && make install)
+    # echo "Testing $D ..."
 
     # TODO test if host matches mingw, can't run tests
     # (cd $D && ./bin/xdelta3regtest)
-    (cd $D && ./bin/xdelta3 test)
+    # (cd $D && ./bin/xdelta3 test)
 }
 
 function buildall {
-    buildit "$1" "$2" 32 "-DXD3_USE_LARGEFILE64=0 $3"
-    buildit "$1" "$2" 64 "-DXD3_USE_LARGEFILE64=1 $3"
+    buildit "$1" "$2" 32 "-DXD3_USE_LARGEFILE64=0 $3" "$4"
+    buildit "$1" "$2" 64 "-DXD3_USE_LARGEFILE64=1 $3" "$4"
 }
 
+# Linux / OS X 64bit
 #buildall x86_64-pc-linux-gnu -m64
+
+# Linux / OS X 32bit
 #buildall x86_64-pc-linux-gnu -m32
 
-MINGW_FLAGS="-DEXTERNAL_COMPRESSION=0 -DVCDIFF_TOOLS=0 -DXD3_WIN32=1 -DSHELL_TESTS=0"
+# Windows 32bit
+buildall i686-w64-mingw32 -mconsole "${MINGW_CFLAGS}" "-L${MINGW_BASE}/mingw-w64-i686/lib ${MINGW_LDFLAGS}"
 
-buildall i686-w64-mingw32 -m32 "${MINGW_FLAGS}"
-buildall x86_64-w64-mingw32 -m64 "${MINGW_FLAGS}"
+# Windows 64bit
+#buildall x86_64-w64-mingw32 -mconsole "${MINGW_CFLAGS}" "-L${MINGW_BASE}/mingw-w64-x86_64/lib ${MINGW_LDFLAGS}"
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 51f3156..6e03c31 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -110,22 +110,26 @@
  */
 #ifndef _WIN32
 #include <stdint.h>
-#else
+#else /* WIN32 case */
 #define WIN32_LEAN_AND_MEAN
+
 #ifndef WINVER
 #if XD3_USE_LARGEFILE64
 /* 64 bit file offsets: uses GetFileSizeEx and SetFilePointerEx.
  * requires Win2000 or newer version of WinNT */
 #define WINVER          0x0500
 #define _WIN32_WINNT    0x0500
-#else
+#else /* xoff_t is 32bit */
 /* 32 bit (DWORD) file offsets: uses GetFileSize and
  * SetFilePointer. compatible with win9x-me and WinNT4 */
 #define WINVER          0x0400
 #define _WIN32_WINNT    0x0400
-#endif
-#endif
+#endif /* if XD3_USE_LARGEFILE64 */
+#endif /* ifndef WINVER */
+
 #include <windows.h>
+
+/* _MSV_VER is defined by Microsoft tools, not by mingw32 */
 #ifdef _MSC_VER
 #define inline
 typedef signed int     ssize_t;
@@ -134,28 +138,34 @@ typedef unsigned char  uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned long  uint32_t;
 typedef ULONGLONG      uint64_t;
-#else
+#else /* _MSC_VER >= 1600 */
 /* For MSVC10 and above */
 #include <stdint.h>
-#endif
-#else
+#endif /* _MSC_VER < 1600 */
+#else /* _MSC_VER not defined  */
 /* mingw32, lcc and watcom provide a proper header */
 #include <stdint.h>
-#endif
-#endif
+#endif /* _MSC_VER defined */
+#endif /* _WIN32 defined */
 
 typedef uint32_t usize_t;
 
 #if XD3_USE_LARGEFILE64
+/* xoff_t is a 64-bit type */
 #define __USE_FILE_OFFSET64 1 /* GLIBC: for 64bit fileops, ... ? */
+
 #ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
 #endif
+
 #ifndef _FILE_OFFSET_BITS
 #define _FILE_OFFSET_BITS 64
 #endif
 
-#if SIZEOF_UNSIGNED_LONG == 8
+#ifdef _WIN32
+typedef uint64_t xoff_t;
+#define Q "I64"
+#elif SIZEOF_UNSIGNED_LONG == 8
 typedef unsigned long xoff_t;
 #define Q "l"
 #elif SIZEOF_SIZE_T == 8
@@ -164,9 +174,6 @@ typedef size_t xoff_t;
 #elif SIZEOF_UNSIGNED_LONG_LONG == 8
 typedef unsigned long long xoff_t;
 #define Q "ll"
-#else
-typedef uint64_t xoff_t;
-#define Q "I64"
 #endif
 
 #define SIZEOF_XOFF_T 8