  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 +40,20 @@
+@@ -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
  

 	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
 

 RCINCLUDEDIRS=--include-dir ../../scintilla/win32 --include-dir ../src
 
 CBASEFLAGS = -W -Wall $(INCLUDEDIRS) $(LUA_DEFINES) -mno-cygwin
@@ -68,7 +84,7 @@
 	$(CC) $(CXXFLAGS) -c $< -o $@
 
 .c.o:
-	gcc $(CFLAGS) -c $< -o $@
+	$(GCC) $(CFLAGS) -c $< -o $@ # modified by Mitchell
 
 OTHER_OBJS	= FilePath.o SciTEBuffers.o SciTEIO.o Exporters.o PropSetFile.o StringList.o \
 SciTEProps.o SciTEWin.o SciTEWinBar.o SciTEWinDlg.o MultiplexExtension.o \
@@ -78,38 +94,38 @@
 
 OBJS = SciTEBase.o $(OTHER_OBJS)
 
