--- scintilla/win32/makefile	Sat Feb 16 14:10:10 2002
+++ scintilla-nocygwin/win32/makefile	Sun Aug 18 16:42:30 2002
@@ -5,8 +5,8 @@
 # be needed to use other compilers.
 
 .SUFFIXES: .cxx
-CC = g++
-DLLWRAP = dllwrap
+CC = gcc -mno-cygwin
+DLLWRAP = gcc -mno-cygwin -shared
 
 COMPONENT = ../bin/Scintilla.dll
 LEXCOMPONENT = ../bin/SciLexer.dll
@@ -14,11 +14,11 @@
 vpath %.h ../src ../include
 vpath %.cxx ../src
 
-LDFLAGS=-mwindows -limm32 -lole32 -luuid
+LDFLAGS=-mwindows -limm32 -lole32 -luuid -lstdc++
 # Add -MMD to get dependencies
 #CXXFLAGS = -g -pg -pedantic -Os -fno-exceptions -fvtable-thunks -fno-rtti
 INCLUDEDIRS=-I ../include -I ../src
-CXXBASEFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions -fvtable-thunks -fno-rtti
+CXXBASEFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions -fno-rtti
 
 ifdef DEBUG
 CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
@@ -47,7 +47,7 @@
 	ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o \
 	Style.o ViewStyle.o AutoComplete.o UniConversion.o PropSet.o
 $(COMPONENT): $(SOBJS)
-	$(DLLWRAP) --target i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) -s --relocatable
+	$(DLLWRAP) -o $@ $(SOBJS) $(LDFLAGS) -s --relocatable
 
 LOBJS	= ScintillaWinL.o ScintillaBaseL.o Editor.o Document.o \
 	ContractionState.o CellBuffer.o CallTip.o \
@@ -55,7 +55,7 @@
 	Style.o ViewStyle.o AutoComplete.o UniConversion.o KeyWords.o \
 	DocumentAccessor.o PropSet.o ExternalLexer.o StyleContext.o $(LEXOBJS)
 $(LEXCOMPONENT): $(LOBJS)
-	$(DLLWRAP) --target i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) -s --relocatable
+	$(DLLWRAP) -o $@ $(LOBJS) $(LDFLAGS) -s --relocatable
 
 # Automatically generate dependencies for most files with "make deps"
 include deps.mak