enable generation of gcstub.obj

git-svn-id: http://svn.dsource.org/projects/druntime/trunk@34 4a9d5153-6564-4b3f-b5e1-7e8e9dac548f

diff --git a/src/dmd-win32.mak b/src/dmd-win32.mak
index d7c83b1d0ff5ed60d35afcc4f32250b2fdf208cf..2647819b1788621b2e6f684055de4911242d4c11 100644 (file)
--- a/src/dmd-win32.mak
+++ b/src/dmd-win32.mak
@@ -17,6 +17,7 @@ LIB_MASK=druntime*.lib
 DIR_CC=common
 DIR_RT=compiler\dmd
 DIR_GC=gc\basic
+DIR_GC_STUB=gc\stub
 
 LIB_CC=$(DIR_CC)\druntime-core.lib
 LIB_RT=$(DIR_RT)\druntime-rt-dmd.lib
@@ -58,11 +59,15 @@ lib : $(ALL_OBJS)
        cd $(DIR_GC)
        make -fwin32.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
        cd ..\..
+       cd $(DIR_GC_STUB)
+       make -fwin32.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
+       cd ..\..
        $(RM) $(LIB_TARGET)
        $(LC) -c -n $(LIB_TARGET) $(LIB_CC) $(LIB_RT) $(LIB_GC)
        $(RM) $(DUP_TARGET)
        copy $(LIB_TARGET) $(DUP_TARGET)
 
+
 doc : $(ALL_DOCS)
        cd $(DIR_CC)
        make -fwin32.mak doc DC=$(DC)
@@ -73,6 +78,9 @@ doc : $(ALL_DOCS)
        cd $(DIR_GC)
        make -fwin32.mak doc DC=$(DC)
        cd ..\..
+       cd $(DIR_GC_STUB)
+       make -fwin32.mak doc DC=$(DC)
+       cd ..\..
 
 ######################################################
 
@@ -89,6 +97,9 @@ clean :
        cd $(DIR_GC)
        make -fwin32.mak clean
        cd ..\..
+       cd $(DIR_GC_STUB)
+       make -fwin32.mak clean
+       cd ..\..
        $(RM) $(LIB_MASK)
 
 install :
@@ -101,4 +112,7 @@ install :
        cd $(DIR_GC)
        make -fwin32.mak install
        cd ..\..
+       cd $(DIR_GC_STUB)
+       make -fwin32.mak install
+       cd ..\..
        $(CP) $(LIB_MASK) $(LIB_DEST)\.

diff --git a/src/gc/stub/win32.mak b/src/gc/stub/win32.mak
index 44a8fe1600034bce309de0cb6c6e96e6ac8c8586..e3152871fd87f211e22d19caf050031276e2f033 100644 (file)
--- a/src/gc/stub/win32.mak
+++ b/src/gc/stub/win32.mak
@@ -10,8 +10,8 @@
 #      make clean
 #              Delete unneeded files created by build process
 
-LIB_TARGET=tango-gc-stub.lib
-LIB_MASK=tango-gc-stub*.lib
+LIB_TARGET=druntime-gc-stub.lib
+LIB_MASK=druntime-gc-stub*.lib
 
 CP=xcopy /y
 RM=del /f
@@ -37,7 +37,7 @@ CC=dmc
 LC=lib
 DC=dmd
 
-LIB_DEST=..
+LIB_DEST=..\..\..\lib
 
 .DEFAULT: .asm .c .cpp .d .html .obj
 
@@ -93,3 +93,4 @@ clean :
 install :
        $(MD) $(LIB_DEST)
        $(CP) $(LIB_MASK) $(LIB_DEST)\.
+       copy gc.obj $(LIB_DEST)\gcstub.obj