diff --git a/Makefile.in b/Makefile.in
index 9c4a238..c3d3de9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,6 +11,7 @@ top_srcdir = $(srcdir)
 hdrdir = $(srcdir)/include
 
 CC = @CC@
+CPP = @CPP@
 YACC = bison
 PURIFY =
 AUTOCONF = autoconf
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index eb6967a..e1cb84d 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -2,7 +2,8 @@ include Makefile
 -include uncommon.mk
 
 ENABLE_SHARED=@ENABLE_SHARED@
-DLLWRAP = @DLLWRAP@ --target=@target_os@
+DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)"
+WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED
 
 ifeq (@target_os@,cygwin)
   DLL_BASE_NAME := $(LIBRUBY_SO:.dll=)
@@ -38,7 +39,7 @@ $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
 $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
 
 %.res.@OBJEXT@: %.rc
-	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
+	$(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
 $(RCFILES): $(RBCONFIG)
 	@$(MINIRUBY) $(srcdir)/win32/resource.rb \