  	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 @@
++++ scintillua/scite/win32/makefile	2010-01-17 15:42:24.000000000 +0000
+@@ -5,8 +5,20 @@
  # be needed to use other compilers.
  
  .SUFFIXES: .cxx
--CC = g++
-+CC = i486-mingw32-g++ -mms-bitfields # modified by Mitchell
++# added by Mitchell
++ifdef LINUX
++CC = i486-mingw32-g++ -mms-bitfields
++DLLWRAP = dllwrap
++GCC = i486-mingw32-gcc
++WINDRES = i486-mingw32-windres
++else
++# end added by Mitchell
+ CC = g++
  DLLWRAP = dllwrap
--ifndef CYGWIN
--DEL = del /q
--COPY = copy
--else
-+# modified by Mitchell
-+#ifndef CYGWIN
-+#DEL = del /q
-+#COPY = copy
-+#else
++# added by Mitchell
++GCC = gcc
++WINDRES = windres
++# end added by Mitchell
+ ifndef CYGWIN
+ DEL = del /q
+ COPY = copy
+@@ -14,6 +26,7 @@
  DEL = rm
  COPY = cp
--endif
-+#endif
-+# end modified by Mitchell
+ endif
++endif # added by Mitchell
  
  PROG	= ../bin/SciTE.exe
  PROGSTATIC = ../bin/Sc1.exe
-@@ -25,12 +27,12 @@
+@@ -25,12 +38,12 @@
  endif
  endif
  

 
 $(PROG): $(OBJS)
 	$(CC) $(STRIPFLAG) -Xlinker --subsystem -Xlinker windows -o  $@ $^ $(LDFLAGS)
@@ -288,12 +293,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
 
 # 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
 
 # Make sure SciTEBase gets rebuilt (so its about box gets a new
 # date stamp) when any of the other objects are updated.

 
 clean:
 	$(DEL) *.exe *.o *.obj *.dll *.res *.map
@@ -117,152 +133,152 @@
 deps:
 	$(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx ../lua/src/*.c ../lua/src/lib/*.c >deps.mak
 
