cd win32
set INCLUDE=..\..\directxsdk-0908\include;%INCLUDE%
nmake -f makefile.static

#ifdef _mm_malloc
#undef _mm_malloc
#undef _mm_calloc
#undef _mm_free
#endif

diff -Naur libmikmod-3.2.0-beta2\include\mikmod.h.in libmikmod-3.2.0-beta2-2\include\mikmod.h.in
--- libmikmod-3.2.0-beta2\include\mikmod.h.in	Wed Feb 18 09:10:40 2004
+++ libmikmod-3.2.0-beta2-2\include\mikmod.h.in	Mon Apr 26 18:33:00 2004
@@ -44,7 +44,7 @@
 #ifdef DLL_EXPORTS
 #define MIKMODAPI __declspec(dllexport)
 #else
-#define MIKMODAPI __declspec(dllimport)
+#define MIKMODAPI
 #endif
 #else
 #define MIKMODAPI
@@ -54,9 +54,9 @@
  *	========== Library version
  */
 
-#define LIBMIKMOD_VERSION_MAJOR @LIBMIKMOD_MAJOR_VERSION@L
-#define LIBMIKMOD_VERSION_MINOR @LIBMIKMOD_MINOR_VERSION@L
-#define LIBMIKMOD_REVISION      @LIBMIKMOD_MICRO_VERSION@L
+#define LIBMIKMOD_VERSION_MAJOR 3L
+#define LIBMIKMOD_VERSION_MINOR 2L
+#define LIBMIKMOD_REVISION      0L
 
 #define LIBMIKMOD_VERSION \
 	((LIBMIKMOD_VERSION_MAJOR<<16)| \
@@ -83,7 +83,7 @@
 typedef char CHAR;
 #endif
 
-@DOES_NOT_HAVE_SIGNED@
+
 
 #if defined(__arch64__) || defined(__alpha)
 /* 64 bit architectures */
diff -Naur libmikmod-3.2.0-beta2\include\mikmod_internals.h libmikmod-3.2.0-beta2-2\include\mikmod_internals.h
--- libmikmod-3.2.0-beta2\include\mikmod_internals.h	Wed Feb 18 08:29:18 2004
+++ libmikmod-3.2.0-beta2-2\include\mikmod_internals.h	Tue Nov 10 10:47:10 2009
@@ -47,6 +47,12 @@
 #pragma warning(disable:4761)
 #endif
 
+#ifdef _mm_malloc
+#undef _mm_malloc
+#undef _mm_calloc
+#undef _mm_free
+#endif
+
 /*========== More type definitions */
 
 /* SLONGLONG: 64bit, signed */
diff -Naur libmikmod-3.2.0-beta2\win32\Makefile.static libmikmod-3.2.0-beta2-2\win32\Makefile.static
--- libmikmod-3.2.0-beta2\win32\Makefile.static	Wed Jan 21 12:29:36 2004
+++ libmikmod-3.2.0-beta2-2\win32\Makefile.static	Mon Nov 09 15:28:39 2009
@@ -11,7 +11,7 @@
 # Your compiler here
 CC=cl
 # Compiler flags
-CFLAGS=/nologo /O2 /MTd /Zi /Fm /c /DWIN32 /DDRV_DS /DDRV_WIN /DHAVE_FCNTL_H /DHAVE_MALLOC_H /DHAVE_LIMITS_H
+CFLAGS=/nologo /O2 /MD /Zi /Fm /c /DWIN32 /DDRV_DS /DDRV_WIN /DHAVE_FCNTL_H /DHAVE_MALLOC_H /DHAVE_LIMITS_H
 COMPILE=$(CC) $(CFLAGS) /I..\include /I.. /I..\win32
 
 .SUFFIXES:
@@ -29,6 +29,7 @@
     load_669.o load_amf.o load_dsm.o load_far.o load_gdm.o load_it.o  \
     load_imf.o load_m15.o load_med.o load_mod.o load_mtm.o load_okt.o \
     load_s3m.o load_stm.o load_stx.o load_ult.o load_uni.o load_xm.o \
+    load_asy.o \
     mmalloc.o mmerror.o mmio.o \
     mdriver.o mdreg.o mloader.o mlreg.o mlutil.o mplayer.o munitrk.o mwav.o \
     npertab.o sloader.o virtch.o virtch2.o virtch_common.o
@@ -106,6 +107,9 @@
 load_s3m.o:     ..\loaders\load_s3m.c \
 	                ..\win32\mikmod_build.h ..\include\mikmod_internals.h
 	$(COMPILE) /Fo$@ ..\loaders\load_s3m.c
+load_asy.o:     ..\loaders\load_asy.c \
+	                ..\win32\mikmod_build.h ..\include\mikmod_internals.h
+	$(COMPILE) /Fo$@ ..\loaders\load_asy.c
 load_stm.o:     ..\loaders\load_stm.c \
 	                ..\win32\mikmod_build.h ..\include\mikmod_internals.h
 	$(COMPILE) /Fo$@ ..\loaders\load_stm.c
diff -Naur libmikmod-3.2.0-beta2\win32\mikmod_build.h libmikmod-3.2.0-beta2-2\win32\mikmod_build.h
--- libmikmod-3.2.0-beta2\win32\mikmod_build.h	Thu Feb 19 09:15:22 2004
+++ libmikmod-3.2.0-beta2-2\win32\mikmod_build.h	Mon Nov 09 15:19:11 2009
@@ -44,7 +44,7 @@
 #ifdef DLL_EXPORTS
 #define MIKMODAPI __declspec(dllexport)
 #else
-#define MIKMODAPI __declspec(dllimport)
+#define MIKMODAPI
 #endif
 #else
 #define MIKMODAPI

function git-remove-refs()
{
  if [ -z $@ ] ; then
    echo "Usage: git-remove-refs refs_name"
    return
  fi
  git for-each-ref --format="%(refname)" refs/$1 | xargs -I Ref bash -c "echo removing git ref: Ref; git update-ref -d Ref"
}
 
function git-backup-files()
{
  FILES=`git ls-files $@`
  for File in $FILES
  do
    echo save backup for $File
  done
  GIT_BACKUP_TMP=`tempfile`.tar.gz
  tar czf $GIT_BACKUP_TMP $FILES
  echo backup file saved at $GIT_BACKUP_TMP
}
 
function git-restore-files()
{
  if [ -f $GIT_BACKUP_TMP ] ; then
    echo backup file $GIT_BACKUP_TMP restored
    tar xzf $GIT_BACKUP_TMP
    unset GIT_BACKUP_TMP
  fi
}
 
function git-rewrite-commits()
{
  if [ -z $@ ] ; then
    echo "Usage: git-rewrite-commits files_to_remove"
    return
  fi
  git-backup-files $@
  git filter-branch --index-filter "git ls-files -z $@ | git update-index --remove -z --stdin"
  git-remove-refs original
  git-restore-files
}
 
function git-prune-commits()
{
  if [ ! -z $@ ] ; then
    echo "Usage: git-prune-commits"
    return
  fi
  git filter-branch --prune-empty
  git-remove-refs original
}
 
function git-rewrite-msg()
{
  if [ -z $@ ] ; then
    echo "Usage: git-rewrite-msg regex_pattern"
    return
  fi
  git filter-branch --msg-filter "sed -e \"$1\""
  git-remove-refs original
}