1.1 --- a/make/windows/makefiles/sa.make Sun Oct 13 21:14:04 2013 +0100
1.2 +++ b/make/windows/makefiles/sa.make Thu Oct 17 14:20:57 2013 -0700
1.3 @@ -102,7 +102,10 @@
1.4 !if "$(MT)" != ""
1.5 SA_LD_FLAGS = -manifest $(SA_LD_FLAGS)
1.6 !endif
1.7 -SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp
1.8 +
1.9 +SASRCFILES = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp \
1.10 + $(AGENT_DIR)/src/share/native/sadis.c
1.11 +
1.12 SA_LFLAGS = $(SA_LD_FLAGS) -nologo -subsystem:console -machine:$(MACHINE)
1.13 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
1.14 SA_LFLAGS = $(SA_LFLAGS) -map -debug
1.15 @@ -111,22 +114,24 @@
1.16 SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS)
1.17 !endif
1.18
1.19 +SA_CFLAGS = $(SA_CFLAGS) $(MP_FLAG)
1.20 +
1.21 # Note that we do not keep sawindbj.obj around as it would then
1.22 # get included in the dumpbin command in build_vm_def.sh
1.23
1.24 # In VS2005 or VS2008 the link command creates a .manifest file that we want
1.25 # to insert into the linked artifact so we do not need to track it separately.
1.26 # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
1.27 -$(SAWINDBG): $(SASRCFILE)
1.28 +$(SAWINDBG): $(SASRCFILES)
1.29 set INCLUDE=$(SA_INCLUDE)$(INCLUDE)
1.30 $(CXX) @<<
1.31 -I"$(BootStrapDir)/include" -I"$(BootStrapDir)/include/win32"
1.32 -I"$(GENERATED)" $(SA_CFLAGS)
1.33 - $(SASRCFILE)
1.34 + $(SASRCFILES)
1.35 -out:$*.obj
1.36 <<
1.37 set LIB=$(SA_LIB)$(LIB)
1.38 - $(LD) -out:$@ -DLL $*.obj dbgeng.lib $(SA_LFLAGS)
1.39 + $(LD) -out:$@ -DLL sawindbg.obj sadis.obj dbgeng.lib $(SA_LFLAGS)
1.40 !if "$(MT)" != ""
1.41 $(MT) -manifest $(@F).manifest -outputresource:$(@F);#2
1.42 !endif
