  $(COMPONENT): $(SOBJS) Scintilla.def
  	$(DLLWRAP) --add-stdcall-alias --target i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) $(STRIPFLAG) --relocatable
  
-@@ -76,13 +89,13 @@
+@@ -76,13 +103,13 @@
  	Document.o ContractionState.o CellBuffer.o CallTip.o \
  	ScintRes.o PlatWin.o PositionCache.o KeyMap.o Indicator.o LineMarker.o RESearch.o RunStyles.o \
  	Selection.o Style.o ViewStyle.o AutoComplete.o UniConversion.o KeyWords.o \

 
-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
