    ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
  PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h
 --- scite-latest/scintilla/win32/makefile	2009-08-19 23:09:46.000000000 +0000
-+++ scintillua/scintilla/win32/makefile	2010-01-12 22:50:07.000000000 +0000
-@@ -7,9 +7,11 @@
++++ scintillua/scintilla/win32/makefile	2010-01-17 18:18:19.000000000 +0000
+@@ -7,9 +7,25 @@
  # safely if using a newer version which may display warning messages.
  
  .SUFFIXES: .cxx
--CC = g++
--DLLWRAP = dllwrap
--DEL = del /q
-+# modified by Mitchell
++# added by Mitchell
++ifdef LINUX
 +CC = i486-mingw32-g++
 +DLLWRAP = i486-mingw32-dllwrap
 +DEL = rm
-+# end modified by Mitchell
++GCC = i486-mingw32-gcc
++RANLIB = i486-mingw32-ranlib
++WINDRES = i486-mingw32-windres
++else
++# end added by Mitchell
+ CC = g++
+ DLLWRAP = dllwrap
+ DEL = del /q
++# added by Mitchell
++GCC = gcc
++RANLIB = ranlib
++WINDRES = windres
++endif
++# end added by Mitchell
  
  COMPONENT = ../bin/Scintilla.dll
  LEXCOMPONENT = ../bin/SciLexer.dll
-@@ -24,11 +26,12 @@
+@@ -24,11 +40,12 @@
  
  vpath %.h ../src ../include
  vpath %.cxx ../src

 
-LUA_OBJS = LuaExtension.o SingleThreadExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
+LUA_OBJS = LuaExtension.o SingleThreadExtension.o # modified by Mitchell
+LUA_LDFLAGS = -L ../../scintilla/bin -lSciLexer
 
 vpath %.c ../lua/src ../lua/src/lib
 

+$(LEXLIB): $(LEXOBJS) $(LUA_OBJS) # modified by Mitchell
 	$(AR) rc $@ $^
-	ranlib $@
+	$(RANLIB) $@ # modified by Mitchell
 
 # Automatically generate dependencies for most files with "make deps"
 include deps.mak
@@ -113,5 +140,5 @@
 	$(CC) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
 
 ScintRes.o:	ScintRes.rc PlatformRes.h
-	windres ScintRes.rc $@
+	$(WINDRES) ScintRes.rc $@ # modified by Mitchell
 
--- scite-latest/scintilla/win32/scintilla.mak	2009-07-21 10:55:11.000000000 +0000
+++ scintillua/scintilla/win32/scintilla.mak	2010-01-10 22:27:12.000000000 +0000
