*** old/agent/src/os/win32/windbg/Makefile	Thu Sep 17 16:09:36 2009
--- new/agent/src/os/win32/windbg/Makefile	Thu Sep 17 16:09:36 2009

*** 33,42 ****
--- 33,44 ----
  WINDBG_INCLUDE=$(WINDBG_HOME)/sdk/inc
  WINDBG_LIB32=$(WINDBG_HOME)/sdk/lib/i386
  WINDBG_LIB_IA64=$(WINDBG_HOME)/sdk/lib/ia64
  WINDBG_LIB_AMD64=$(WINDBG_HOME)/sdk/lib/amd64
  
+ SADIS=../../../share/native/sadis.c
+ 
  # These do not need to be optimized (don't run a lot of code) and it
  # will be useful to have the assertion checks in place
  
  CFLAGS32=/nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  

*** 55,81 ****
--- 57,89 ----
  
  ia64: ia64/$(SAWINDBGDLL)
  
  amd64: amd64/$(SAWINDBGDLL)
  
! i386/$(SAWINDBGDLL) : sawindbg.cpp $(SADIS)
          @ mkdir -p i386
          @ $(JAVAH) -jni -classpath ../../../../build/classes sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal sun.jvm.hotspot.debugger.x86.X86ThreadContext
+         @ $(JAVAH) -jni -classpath ../../../../build/classes sun.jvm.hotspot.asm.Disassembler
          @ $(CPP32) /I$(JAVA_HOME)/include /I$(JAVA_HOME)/include/win32 /I$(WINDBG_INCLUDE) $(CFLAGS32) /Fp"i386/sawindbg.pch" /Fo"i386/" /Fd"i386/" /c sawindbg.cpp
!         $(LINK32) /out:$@ /DLL i386/sawindbg.obj $(LIBS32)
!         @ $(CPP32) /I$(JAVA_HOME)/include /I$(JAVA_HOME)/include/win32 /I$(WINDBG_INCLUDE) $(CFLAGS32) /Fp"i386/sadis.pch" /Fo"i386/" /Fd"i386/" /c  $(SADIS)
+         $(LINK32) /out:$@ /DLL i386/sawindbg.obj i386/sadis.obj $(LIBS32) 
  
! ia64/$(SAWINDBGDLL) : sawindbg.cpp $(SADIS)
          @ mkdir -p ia64
          @ $(JAVAH) -jni -classpath ../../../../build/classes sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal sun.jvm.hotspot.debugger.ia64.IA64ThreadContext
+         @ $(JAVAH) -jni -classpath ../../../../build/classes sun.jvm.hotspot.asm.Disassembler
          @ $(CPP64) /I$(JAVA_HOME)/include /I$(JAVA_HOME)/include/win32 /I$(WINDBG_INCLUDE) $(CFLAGS64) /Fp"ia64/sawindbg.pch" /Fo"ia64/" /Fd"ia64/" /c sawindbg.cpp
!         $(LINK64) /out:$@ /DLL ia64/sawindbg.obj $(LIBS_IA64)
!         @ $(CPP64) /I$(JAVA_HOME)/include /I$(JAVA_HOME)/include/win32 /I$(WINDBG_INCLUDE) $(CFLAGS64) /Fp"ia64/sadis.pch" /Fo"ia64/" /Fd"ia64/" /c $(SADIS)
+         $(LINK64) /out:$@ /DLL ia64/sawindbg.obj ia64/sadis.obj $(LIBS_IA64)
  
! amd64/$(SAWINDBGDLL) : sawindbg.cpp $(SADIS)
          @ mkdir -p amd64
          @ $(JAVAH) -jni -classpath ../../../../build/classes sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
+         @ $(JAVAH) -jni -classpath ../../../../build/classes sun.jvm.hotspot.asm.Disassembler
          @ $(CPP64) /I$(JAVA_HOME)/include /I$(JAVA_HOME)/include/win32 /I$(WINDBG_INCLUDE) $(CFLAGS64) /Fp"amd64/sawindbg.pch" /Fo"amd64/" /Fd"amd64/" /c sawindbg.cpp
!         $(LINK64) /out:$@ /DLL amd64/sawindbg.obj $(LIBS_AMD64)
!         @ $(CPP64) /I$(JAVA_HOME)/include /I$(JAVA_HOME)/include/win32 /I$(WINDBG_INCLUDE) $(CFLAGS64) /Fp"amd64/sadis.pch" /Fo"amd64/" /Fd"amd64/" /c $(SADIS)
+         $(LINK64) /out:$@ /DLL amd64/sawindbg.obj amd64/sadis.obj $(LIBS_AMD64)
  
  clean:
          rm *.h
          rm -rf i386
          rm -rf ia64