  
  $(PROG): $(OBJS)
  	$(CC) $(STRIPFLAG) -Xlinker --subsystem -Xlinker windows -o  $@ $^ $(LDFLAGS)
-@@ -288,12 +293,12 @@
+@@ -288,12 +304,12 @@
  	$(CC) $(CXXFLAGS) -D STATIC_BUILD -c $< -o $@
  
  SciTERes.o:	SciTERes.rc SciTE.h PlatformRes.h
 -	windres $(RCINCLUDEDIRS) SciTERes.rc $@
-+	i486-mingw32-windres $(RCINCLUDEDIRS) SciTERes.rc $@ # modified by Mitchell
++	$(WINDRES) $(RCINCLUDEDIRS) SciTERes.rc $@ # modified by Mitchell
  
  # Also depends on ../src/Embedded.properties but may not want to build everywhere
  # so must explicitly ask to build it.
  Sc1Res.o:	SciTERes.rc SciTE.h PlatformRes.h
 -	windres $(RCINCLUDEDIRS) SciTERes.rc --define STATIC_BUILD $@
-+	i486-mingw32-windres $(RCINCLUDEDIRS) SciTERes.rc --define STATIC_BUILD $@ # modified by Mitchell
++	$(WINDRES) $(RCINCLUDEDIRS) SciTERes.rc --define STATIC_BUILD $@ # modified by Mitchell
  
  # Make sure SciTEBase gets rebuilt (so its about box gets a new
  # date stamp) when any of the other objects are updated.

 	if (CurrentBuffer()->useMonoFont) {
 		sval = props.GetExpanded("font.monospace");
--- scite-latest/scite/win32/makefile	2009-07-21 11:02:26.000000000 +0000
+++ scintillua/scite/win32/makefile	2010-01-12 23:42:13.000000000 +0000
@@ -5,15 +5,17 @@
 # be needed to use other compilers.
 
 .SUFFIXES: .cxx
-CC = g++
+CC = i486-mingw32-g++ -mms-bitfields # modified by Mitchell
 DLLWRAP = dllwrap
-ifndef CYGWIN
-DEL = del /q
-COPY = copy
-else
+# modified by Mitchell
+#ifndef CYGWIN
+#DEL = del /q
+#COPY = copy
+#else
 DEL = rm
 COPY = cp
-endif
+#endif
+# end modified by Mitchell
 
 PROG	= ../bin/SciTE.exe
 PROGSTATIC = ../bin/Sc1.exe
@@ -25,12 +27,12 @@
 endif
 endif
 

 LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
 		lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
 		ltable.o ltm.o lundump.o lvm.o lzio.o
@@ -38,17 +51,20 @@
 LUA_LIB_OBJS =	lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o ltablib.o \
 		lstrlib.o loadlib.o loslib.o linit.o
 
