--- src_root/shell/qa/zip/testimpl/makefile.mk.orig	2011-04-23 13:29:33.630250000 +0900
+++ src_root/shell/qa/zip/testimpl/makefile.mk	2011-04-24 07:45:01.773000000 +0900
@@ -42,17 +42,18 @@
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1OBJS = $(SLOFILES)
 SHL1RPATH = NONE
-.IF "$(OS)" == "WNT"
-	SHL1STDLIBS = msvcprt.lib 
+SHL1STDLIBS = $(ZLIB3RDLIB) 
+.IF "$(OS)" == "WNT" && "$(COM)" != "GCC"
+	SHL1STDLIBS += msvcprt.lib 
 .ENDIF
-SHL1LIBS = $(SOLARLIBDIR)$/zlib.lib $(SLB)$/zipfile.lib   
+SHL1LIBS = $(SLB)$/zipfile.lib   
 SLOFILES=$(SLO)$/testzipimpl.obj
 SHL1TARGET = $(TARGET)
 DEF1NAME=$(SHL1TARGET)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT" && "$(COM)" != "GCC"
 	INCLUDE!:=$(subst,/stl, $(INCLUDE))
 	.EXPORT : INCLUDE 
 .ENDIF
--- src_root/shell/qa/zip/makefile.mk.orig	2011-04-23 13:29:33.614625000 +0900
+++ src_root/shell/qa/zip/makefile.mk	2011-04-24 08:37:43.108875000 +0900
@@ -39,7 +39,11 @@
 SHL1OBJS = $(SLOFILES)
 SHL1RPATH = NONE
 SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB)  
+.IF "$(COM)"=="GCC"
+SHL1STDLIBS += -lqa_zipimpl
+.ELSE
 SHL1LIBS = $(SLB)$/..$/lib$/iqa_zipimpl.lib
+.ENDIF
 SHL1TARGET = $(TARGET)
 SHL1VERSIONMAP = $(PRJ)/qa/zip/export.map
 DEF1NAME=$(SHL1TARGET)