diff -Nurb wxformbuilder_3.0.57.LP/plugins/additional/Makefile wxformbuilder_3.0.57.orig/plugins/additional/Makefile
--- wxformbuilder_3.0.57.LP/plugins/additional/Makefile	2008-04-16 04:15:40.000000000 +0200
+++ wxformbuilder_3.0.57.orig/plugins/additional/Makefile	2008-04-16 17:06:00.000000000 +0200
@@ -13,7 +13,7 @@
   CPPFLAGS := -MMD -D "BUILD_DLL" -D "TIXML_USE_TICPP" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -I "../../sdk/tinyxml" -I "../../sdk/plugin_interface"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -O3 -Wall -fPIC -fno-strict-aliasing `wx-config --debug=no --cflags`
   CXXFLAGS := $(CFLAGS)
-  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s `wx-config --libs std richtext` -L../../sdk/lib -lfbPluginInterface -L../../sdk/lib -lticpp
+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s `wx-config --libs` -L../../sdk/lib -lfbPluginInterface -L../../sdk/lib -lticpp
   LDDEPS := ../../sdk/lib/libfbPluginInterface.a ../../sdk/lib/libticpp.a
   RESFLAGS := -D "BUILD_DLL" -D "TIXML_USE_TICPP" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -I "../../sdk/tinyxml" -I "../../sdk/plugin_interface"
   TARGET := libadditional.so
@@ -28,7 +28,7 @@
   CPPFLAGS := -MMD -D "BUILD_DLL" -D "TIXML_USE_TICPP" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -D "__WXFB_DEBUG__" -I "../../sdk/tinyxml" -I "../../sdk/plugin_interface"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -g -Wall -fPIC -O0 `wx-config --debug=no --cflags`
   CXXFLAGS := $(CFLAGS)
-  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared `wx-config --debug=no --libs std richtext` -L../../sdk/lib -lfbPluginInterfaced -L../../sdk/lib -lticppd
+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared `wx-config --debug=no --libs` -L../../sdk/lib -lfbPluginInterfaced -L../../sdk/lib -lticppd
   LDDEPS := ../../sdk/lib/libfbPluginInterfaced.a ../../sdk/lib/libticppd.a
   RESFLAGS := -D "BUILD_DLL" -D "TIXML_USE_TICPP" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -D "__WXFB_DEBUG__" -I "../../sdk/tinyxml" -I "../../sdk/plugin_interface"
   TARGET := libadditionald.so
diff -Nurb wxformbuilder_3.0.57.LP/plugins/wxAdditions/Makefile wxformbuilder_3.0.57.orig/plugins/wxAdditions/Makefile
--- wxformbuilder_3.0.57.LP/plugins/wxAdditions/Makefile	2008-04-16 04:15:40.000000000 +0200
+++ wxformbuilder_3.0.57.orig/plugins/wxAdditions/Makefile	2008-04-16 17:06:00.000000000 +0200
@@ -13,8 +13,8 @@
   CPPFLAGS := -MMD -D "BUILD_DLL" -D "TIXML_USE_TICPP" -D "SCI_NAMESPACE" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -I "../../src/controls/include" -I "../../sdk/tinyxml" -I "../../sdk/plugin_interface"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -O3 -Wall -fPIC -fno-strict-aliasing `wx-config --debug=no --cflags`
   CXXFLAGS := $(CFLAGS)
-  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s -Wl,-rpath,/usr/lib/wxformbuilder `wx-config --libs` -L"../../output/lib/wxformbuilder" -lwx_gtk2u_flatnotebook-2.8_wxfb -lwx_gtk2u_propgrid-2.8_wxfb -lwx_gtk2u_scintilla-2.8_wxfb -L../../sdk/lib -lfbPluginInterface -L../../sdk/lib -lticpp
-  LDDEPS := ../../output/lib/wxformbuilder/libwx_gtk2u_flatnotebook-2.8_wxfb.so ../../output/lib/wxformbuilder/libwx_gtk2u_propgrid-2.8_wxfb.so ../../output/lib/wxformbuilder/libwx_gtk2u_scintilla-2.8_wxfb.so ../../sdk/lib/libfbPluginInterface.a ../../sdk/lib/libticpp.a
+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s -Wl,-rpath,/usr/lib/wxformbuilder `wx-config --libs` -L"../../output/lib/wxformbuilder" -l_flatnotebook-_wxfb -l_propgrid-_wxfb -l_scintilla-_wxfb -L../../sdk/lib -lfbPluginInterface -L../../sdk/lib -lticpp
+  LDDEPS := ../../output/lib/wxformbuilder/lib_flatnotebook-_wxfb.so ../../output/lib/wxformbuilder/lib_propgrid-_wxfb.so ../../output/lib/wxformbuilder/lib_scintilla-_wxfb.so ../../sdk/lib/libfbPluginInterface.a ../../sdk/lib/libticpp.a
   RESFLAGS := -D "BUILD_DLL" -D "TIXML_USE_TICPP" -D "SCI_NAMESPACE" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -I "../../src/controls/include" -I "../../sdk/tinyxml" -I "../../sdk/plugin_interface"
   TARGET := libwxadditions-mini.so
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
@@ -28,8 +28,8 @@
   CPPFLAGS := -MMD -D "BUILD_DLL" -D "TIXML_USE_TICPP" -D "SCI_NAMESPACE" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -D "__WXFB_DEBUG__" -I "../../src/controls/include" -I "../../sdk/tinyxml" -I "../../sdk/plugin_interface"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -g -Wall -fPIC -O0 `wx-config --debug=no --cflags`
   CXXFLAGS := $(CFLAGS)
-  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -Wl,-rpath,/usr/lib/wxformbuilder `wx-config --debug=no --libs` -L"../../output/lib/wxformbuilder" -lwx_gtk2u_flatnotebook-2.8_wxfb -lwx_gtk2u_propgrid-2.8_wxfb -lwx_gtk2u_scintilla-2.8_wxfb -L../../sdk/lib -lfbPluginInterfaced -L../../sdk/lib -lticppd
-  LDDEPS := ../../output/lib/wxformbuilder/libwx_gtk2u_flatnotebook-2.8_wxfb.so ../../output/lib/wxformbuilder/libwx_gtk2u_propgrid-2.8_wxfb.so ../../output/lib/wxformbuilder/libwx_gtk2u_scintilla-2.8_wxfb.so ../../sdk/lib/libfbPluginInterfaced.a ../../sdk/lib/libticppd.a
+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -Wl,-rpath,/usr/lib/wxformbuilder `wx-config --debug=no --libs` -L"../../output/lib/wxformbuilder" -l_flatnotebook-_wxfb -l_propgrid-_wxfb -l_scintilla-_wxfb -L../../sdk/lib -lfbPluginInterfaced -L../../sdk/lib -lticppd
+  LDDEPS := ../../output/lib/wxformbuilder/lib_flatnotebook-_wxfb.so ../../output/lib/wxformbuilder/lib_propgrid-_wxfb.so ../../output/lib/wxformbuilder/lib_scintilla-_wxfb.so ../../sdk/lib/libfbPluginInterfaced.a ../../sdk/lib/libticppd.a
   RESFLAGS := -D "BUILD_DLL" -D "TIXML_USE_TICPP" -D "SCI_NAMESPACE" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -D "__WXFB_DEBUG__" -I "../../src/controls/include" -I "../../sdk/tinyxml" -I "../../sdk/plugin_interface"
   TARGET := libwxadditions-minid.so
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
diff -Nurb wxformbuilder_3.0.57.LP/sdk/tinyxml/Makefile wxformbuilder_3.0.57.orig/sdk/tinyxml/Makefile
--- wxformbuilder_3.0.57.LP/sdk/tinyxml/Makefile	2008-04-16 04:15:40.000000000 +0200
+++ wxformbuilder_3.0.57.orig/sdk/tinyxml/Makefile	2008-04-16 17:06:00.000000000 +0200
@@ -36,11 +36,11 @@
 endif
 
 OBJECTS := \
+	$(OBJDIR)/ticpp.o \
 	$(OBJDIR)/tinyxmlerror.o \
+	$(OBJDIR)/tinystr.o \
 	$(OBJDIR)/tinyxml.o \
 	$(OBJDIR)/tinyxmlparser.o \
-	$(OBJDIR)/ticpp.o \
-	$(OBJDIR)/tinystr.o \
 
 MKDIR_TYPE := msdos
 CMD := $(subst \,\\,$(ComSpec)$(COMSPEC))
@@ -82,27 +82,27 @@
 	-@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR))
 endif
 
-$(OBJDIR)/tinyxmlerror.o: tinyxmlerror.cpp
+$(OBJDIR)/ticpp.o: ticpp.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/tinyxml.o: tinyxml.cpp
+$(OBJDIR)/tinyxmlerror.o: tinyxmlerror.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/tinyxmlparser.o: tinyxmlparser.cpp
+$(OBJDIR)/tinystr.o: tinystr.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/ticpp.o: ticpp.cpp
+$(OBJDIR)/tinyxml.o: tinyxml.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/tinystr.o: tinystr.cpp
+$(OBJDIR)/tinyxmlparser.o: tinyxmlparser.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
diff -Nurb wxformbuilder_3.0.57.LP/src/controls/build/propgrid/Makefile wxformbuilder_3.0.57.orig/src/controls/build/propgrid/Makefile
--- wxformbuilder_3.0.57.LP/src/controls/build/propgrid/Makefile	2008-04-16 04:15:40.000000000 +0200
+++ wxformbuilder_3.0.57.orig/src/controls/build/propgrid/Makefile	2008-04-16 17:06:00.000000000 +0200
@@ -16,7 +16,7 @@
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s `wx-config --libs`
   LDDEPS :=
   RESFLAGS := -D "WXMAKINGDLL_PROPGRID" -D "MONOLITHIC" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -I "../../include"
-  TARGET := libwx_gtk2u_propgrid-2.8_wxfb.so
+  TARGET := lib_propgrid-_wxfb.so
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
 
@@ -31,17 +31,17 @@
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared `wx-config --debug=no --libs`
   LDDEPS :=
   RESFLAGS := -D "WXMAKINGDLL_PROPGRID" -D "MONOLITHIC" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -D "__WXFB_DEBUG__" -I "../../include"
-  TARGET := libwx_gtk2u_propgrid-2.8_wxfb.so
+  TARGET := lib_propgrid-_wxfb.so
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
 
 OBJECTS := \
-	$(OBJDIR)/extras.o \
-	$(OBJDIR)/odcombo.o \
+	$(OBJDIR)/props.o \
 	$(OBJDIR)/advprops.o \
+	$(OBJDIR)/odcombo.o \
+	$(OBJDIR)/extras.o \
 	$(OBJDIR)/manager.o \
 	$(OBJDIR)/propgrid.o \
-	$(OBJDIR)/props.o \
 
 MKDIR_TYPE := msdos
 CMD := $(subst \,\\,$(ComSpec)$(COMSPEC))
@@ -83,32 +83,32 @@
 	-@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR))
 endif
 
-$(OBJDIR)/extras.o: ../../src/propgrid/extras.cpp
+$(OBJDIR)/props.o: ../../src/propgrid/props.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/odcombo.o: ../../src/propgrid/odcombo.cpp
+$(OBJDIR)/advprops.o: ../../src/propgrid/advprops.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/advprops.o: ../../src/propgrid/advprops.cpp
+$(OBJDIR)/odcombo.o: ../../src/propgrid/odcombo.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/manager.o: ../../src/propgrid/manager.cpp
+$(OBJDIR)/extras.o: ../../src/propgrid/extras.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/propgrid.o: ../../src/propgrid/propgrid.cpp
+$(OBJDIR)/manager.o: ../../src/propgrid/manager.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/props.o: ../../src/propgrid/props.cpp
+$(OBJDIR)/propgrid.o: ../../src/propgrid/propgrid.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
diff -Nurb wxformbuilder_3.0.57.LP/src/controls/build/wxFlatNotebook/Makefile wxformbuilder_3.0.57.orig/src/controls/build/wxFlatNotebook/Makefile
--- wxformbuilder_3.0.57.LP/src/controls/build/wxFlatNotebook/Makefile	2008-04-16 04:15:40.000000000 +0200
+++ wxformbuilder_3.0.57.orig/src/controls/build/wxFlatNotebook/Makefile	2008-04-16 17:06:00.000000000 +0200
@@ -16,7 +16,7 @@
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s `wx-config --libs`
   LDDEPS :=
   RESFLAGS := -D "WXMAKINGDLL_FNB" -D "MONOLITHIC" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -I "../../include"
-  TARGET := libwx_gtk2u_flatnotebook-2.8_wxfb.so
+  TARGET := lib_flatnotebook-_wxfb.so
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
 
@@ -31,16 +31,16 @@
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared `wx-config --debug=no --libs`
   LDDEPS :=
   RESFLAGS := -D "WXMAKINGDLL_FNB" -D "MONOLITHIC" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -D "__WXFB_DEBUG__" -I "../../include"
-  TARGET := libwx_gtk2u_flatnotebook-2.8_wxfb.so
+  TARGET := lib_flatnotebook-_wxfb.so
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
 
 OBJECTS := \
 	$(OBJDIR)/renderer.o \
 	$(OBJDIR)/fnb_customize_dlg.o \
-	$(OBJDIR)/xh_fnb.o \
-	$(OBJDIR)/fnb_resources.o \
 	$(OBJDIR)/wxFlatNotebook.o \
+	$(OBJDIR)/fnb_resources.o \
+	$(OBJDIR)/xh_fnb.o \
 	$(OBJDIR)/popup_dlg.o \
 
 MKDIR_TYPE := msdos
@@ -93,7 +93,7 @@
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/xh_fnb.o: ../../src/wxFlatNotebook/xh_fnb.cpp
+$(OBJDIR)/wxFlatNotebook.o: ../../src/wxFlatNotebook/wxFlatNotebook.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
@@ -103,7 +103,7 @@
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/wxFlatNotebook.o: ../../src/wxFlatNotebook/wxFlatNotebook.cpp
+$(OBJDIR)/xh_fnb.o: ../../src/wxFlatNotebook/xh_fnb.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
diff -Nurb wxformbuilder_3.0.57.LP/src/controls/build/wxScintilla/Makefile wxformbuilder_3.0.57.orig/src/controls/build/wxScintilla/Makefile
--- wxformbuilder_3.0.57.LP/src/controls/build/wxScintilla/Makefile	2008-04-16 04:15:40.000000000 +0200
+++ wxformbuilder_3.0.57.orig/src/controls/build/wxScintilla/Makefile	2008-04-16 17:06:00.000000000 +0200
@@ -16,7 +16,7 @@
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s `wx-config --libs`
   LDDEPS :=
   RESFLAGS := -D "WXMAKINGDLL_SCI" -D "MONOLITHIC" -D "LINK_LEXERS" -D "SCI_LEXER" -D "SCI_NAMESPACE" -D "__WX__" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "GTK" -D "NDEBUG" -I "../../include" -I "../../src/wxScintilla" -I "../../src/wxScintilla/scintilla/include" -I "../../src/wxScintilla/scintilla/src"
-  TARGET := libwx_gtk2u_scintilla-2.8_wxfb.so
+  TARGET := lib_scintilla-_wxfb.so
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
 
@@ -31,96 +31,96 @@
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared `wx-config --debug=no --libs`
   LDDEPS :=
   RESFLAGS := -D "WXMAKINGDLL_SCI" -D "MONOLITHIC" -D "LINK_LEXERS" -D "SCI_LEXER" -D "SCI_NAMESPACE" -D "__WX__" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "GTK" -D "NDEBUG" -D "__WXFB_DEBUG__" -I "../../include" -I "../../src/wxScintilla" -I "../../src/wxScintilla/scintilla/include" -I "../../src/wxScintilla/scintilla/src"
-  TARGET := libwx_gtk2u_scintilla-2.8_wxfb.so
+  TARGET := lib_scintilla-_wxfb.so
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
 
 OBJECTS := \
 	$(OBJDIR)/wxscintilla.o \
-	$(OBJDIR)/ScintillaWX.o \
 	$(OBJDIR)/PlatWX.o \
-	$(OBJDIR)/LexLout.o \
-	$(OBJDIR)/LexPerl.o \
-	$(OBJDIR)/LexAPDL.o \
-	$(OBJDIR)/LexCPP.o \
-	$(OBJDIR)/LexAda.o \
+	$(OBJDIR)/ScintillaWX.o \
+	$(OBJDIR)/LexErlang.o \
+	$(OBJDIR)/RunStyles.o \
+	$(OBJDIR)/LexMetapost.o \
+	$(OBJDIR)/KeyMap.o \
 	$(OBJDIR)/LexPB.o \
-	$(OBJDIR)/ContractionState.o \
-	$(OBJDIR)/LexPLM.o \
-	$(OBJDIR)/LexKix.o \
-	$(OBJDIR)/CellBuffer.o \
-	$(OBJDIR)/LexYAML.o \
-	$(OBJDIR)/LexInno.o \
-	$(OBJDIR)/RESearch.o \
-	$(OBJDIR)/LexAU3.o \
-	$(OBJDIR)/LexAVE.o \
-	$(OBJDIR)/LexOthers.o \
-	$(OBJDIR)/StyleContext.o \
-	$(OBJDIR)/WindowAccessor.o \
+	$(OBJDIR)/PositionCache.o \
+	$(OBJDIR)/LexProgress.o \
+	$(OBJDIR)/LexPOV.o \
 	$(OBJDIR)/LexBasic.o \
+	$(OBJDIR)/LexConf.o \
+	$(OBJDIR)/LexGui4Cli.o \
+	$(OBJDIR)/Decoration.o \
 	$(OBJDIR)/PropSet.o \
-	$(OBJDIR)/LexBash.o \
 	$(OBJDIR)/LexHTML.o \
-	$(OBJDIR)/LexCaml.o \
-	$(OBJDIR)/LexMatlab.o \
-	$(OBJDIR)/LexVerilog.o \
-	$(OBJDIR)/LexBaan.o \
-	$(OBJDIR)/LexAsn1.o \
-	$(OBJDIR)/LexMSSQL.o \
+	$(OBJDIR)/LexMPT.o \
+	$(OBJDIR)/LexLisp.o \
+	$(OBJDIR)/LexFlagship.o \
+	$(OBJDIR)/LexD.o \
+	$(OBJDIR)/CharClassify.o \
+	$(OBJDIR)/LexSpecman.o \
+	$(OBJDIR)/CellBuffer.o \
+	$(OBJDIR)/LexGAP.o \
+	$(OBJDIR)/LexAVE.o \
+	$(OBJDIR)/LexOthers.o \
 	$(OBJDIR)/LexVHDL.o \
-	$(OBJDIR)/ScintillaBase.o \
-	$(OBJDIR)/Decoration.o \
-	$(OBJDIR)/LexPOV.o \
 	$(OBJDIR)/LexPS.o \
-	$(OBJDIR)/LexTADS3.o \
-	$(OBJDIR)/LexGui4Cli.o \
-	$(OBJDIR)/LexCmake.o \
 	$(OBJDIR)/LexNsis.o \
-	$(OBJDIR)/LexCsound.o \
-	$(OBJDIR)/LexAsm.o \
-	$(OBJDIR)/LexCLW.o \
-	$(OBJDIR)/LexD.o \
-	$(OBJDIR)/KeyMap.o \
+	$(OBJDIR)/LexBash.o \
+	$(OBJDIR)/LexCrontab.o \
 	$(OBJDIR)/Document.o \
-	$(OBJDIR)/LexSmalltalk.o \
-	$(OBJDIR)/LexVB.o \
-	$(OBJDIR)/LexGAP.o \
-	$(OBJDIR)/UniConversion.o \
-	$(OBJDIR)/KeyWords.o \
-	$(OBJDIR)/CallTip.o \
-	$(OBJDIR)/LexLisp.o \
-	$(OBJDIR)/Editor.o \
-	$(OBJDIR)/LexRebol.o \
-	$(OBJDIR)/LexErlang.o \
-	$(OBJDIR)/LexSpice.o \
+	$(OBJDIR)/LexVerilog.o \
+	$(OBJDIR)/LexLout.o \
 	$(OBJDIR)/Indicator.o \
-	$(OBJDIR)/LexConf.o \
-	$(OBJDIR)/CharClassify.o \
 	$(OBJDIR)/LexTCL.o \
-	$(OBJDIR)/LexFortran.o \
-	$(OBJDIR)/XPM.o \
-	$(OBJDIR)/ViewStyle.o \
-	$(OBJDIR)/LexMPT.o \
-	$(OBJDIR)/LexForth.o \
-	$(OBJDIR)/LexMMIXAL.o \
-	$(OBJDIR)/RunStyles.o \
 	$(OBJDIR)/LexPython.o \
-	$(OBJDIR)/LexCrontab.o \
-	$(OBJDIR)/LexSpecman.o \
-	$(OBJDIR)/LexSQL.o \
-	$(OBJDIR)/LexTeX.o \
-	$(OBJDIR)/LexCSS.o \
-	$(OBJDIR)/ExternalLexer.o \
-	$(OBJDIR)/LexMetapost.o \
-	$(OBJDIR)/LexProgress.o \
-	$(OBJDIR)/Style.o \
 	$(OBJDIR)/LexRuby.o \
+	$(OBJDIR)/LexKix.o \
+	$(OBJDIR)/LexMSSQL.o \
+	$(OBJDIR)/StyleContext.o \
+	$(OBJDIR)/LexAsm.o \
+	$(OBJDIR)/LexPLM.o \
+	$(OBJDIR)/ContractionState.o \
 	$(OBJDIR)/LexEiffel.o \
-	$(OBJDIR)/AutoComplete.o \
-	$(OBJDIR)/LexFlagship.o \
+	$(OBJDIR)/LexCPP.o \
+	$(OBJDIR)/LexCSS.o \
+	$(OBJDIR)/LexCsound.o \
+	$(OBJDIR)/LexForth.o \
 	$(OBJDIR)/LineMarker.o \
+	$(OBJDIR)/AutoComplete.o \
+	$(OBJDIR)/RESearch.o \
+	$(OBJDIR)/Editor.o \
+	$(OBJDIR)/LexSpice.o \
+	$(OBJDIR)/UniConversion.o \
+	$(OBJDIR)/LexYAML.o \
+	$(OBJDIR)/ViewStyle.o \
+	$(OBJDIR)/LexSQL.o \
+	$(OBJDIR)/KeyWords.o \
+	$(OBJDIR)/LexFortran.o \
+	$(OBJDIR)/LexAU3.o \
+	$(OBJDIR)/LexAPDL.o \
+	$(OBJDIR)/LexCmake.o \
+	$(OBJDIR)/LexCLW.o \
+	$(OBJDIR)/LexTADS3.o \
+	$(OBJDIR)/LexAda.o \
+	$(OBJDIR)/LexMatlab.o \
+	$(OBJDIR)/Style.o \
 	$(OBJDIR)/DocumentAccessor.o \
-	$(OBJDIR)/PositionCache.o \
+	$(OBJDIR)/LexBaan.o \
+	$(OBJDIR)/CallTip.o \
+	$(OBJDIR)/ScintillaBase.o \
+	$(OBJDIR)/LexPerl.o \
+	$(OBJDIR)/LexMMIXAL.o \
+	$(OBJDIR)/LexInno.o \
+	$(OBJDIR)/XPM.o \
+	$(OBJDIR)/LexSmalltalk.o \
+	$(OBJDIR)/LexCaml.o \
+	$(OBJDIR)/LexTeX.o \
+	$(OBJDIR)/LexRebol.o \
+	$(OBJDIR)/LexVB.o \
+	$(OBJDIR)/ExternalLexer.o \
+	$(OBJDIR)/WindowAccessor.o \
+	$(OBJDIR)/LexAsn1.o \
 
 MKDIR_TYPE := msdos
 CMD := $(subst \,\\,$(ComSpec)$(COMSPEC))
@@ -167,262 +167,262 @@
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/ScintillaWX.o: ../../src/wxScintilla/ScintillaWX.cpp
+$(OBJDIR)/PlatWX.o: ../../src/wxScintilla/PlatWX.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/PlatWX.o: ../../src/wxScintilla/PlatWX.cpp
+$(OBJDIR)/ScintillaWX.o: ../../src/wxScintilla/ScintillaWX.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexLout.o: ../../src/wxScintilla/scintilla/src/LexLout.cxx
+$(OBJDIR)/LexErlang.o: ../../src/wxScintilla/scintilla/src/LexErlang.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexPerl.o: ../../src/wxScintilla/scintilla/src/LexPerl.cxx
+$(OBJDIR)/RunStyles.o: ../../src/wxScintilla/scintilla/src/RunStyles.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexAPDL.o: ../../src/wxScintilla/scintilla/src/LexAPDL.cxx
+$(OBJDIR)/LexMetapost.o: ../../src/wxScintilla/scintilla/src/LexMetapost.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexCPP.o: ../../src/wxScintilla/scintilla/src/LexCPP.cxx
+$(OBJDIR)/KeyMap.o: ../../src/wxScintilla/scintilla/src/KeyMap.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexAda.o: ../../src/wxScintilla/scintilla/src/LexAda.cxx
+$(OBJDIR)/LexPB.o: ../../src/wxScintilla/scintilla/src/LexPB.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexPB.o: ../../src/wxScintilla/scintilla/src/LexPB.cxx
+$(OBJDIR)/PositionCache.o: ../../src/wxScintilla/scintilla/src/PositionCache.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/ContractionState.o: ../../src/wxScintilla/scintilla/src/ContractionState.cxx
+$(OBJDIR)/LexProgress.o: ../../src/wxScintilla/scintilla/src/LexProgress.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexPLM.o: ../../src/wxScintilla/scintilla/src/LexPLM.cxx
+$(OBJDIR)/LexPOV.o: ../../src/wxScintilla/scintilla/src/LexPOV.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexKix.o: ../../src/wxScintilla/scintilla/src/LexKix.cxx
+$(OBJDIR)/LexBasic.o: ../../src/wxScintilla/scintilla/src/LexBasic.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/CellBuffer.o: ../../src/wxScintilla/scintilla/src/CellBuffer.cxx
+$(OBJDIR)/LexConf.o: ../../src/wxScintilla/scintilla/src/LexConf.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexYAML.o: ../../src/wxScintilla/scintilla/src/LexYAML.cxx
+$(OBJDIR)/LexGui4Cli.o: ../../src/wxScintilla/scintilla/src/LexGui4Cli.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexInno.o: ../../src/wxScintilla/scintilla/src/LexInno.cxx
+$(OBJDIR)/Decoration.o: ../../src/wxScintilla/scintilla/src/Decoration.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/RESearch.o: ../../src/wxScintilla/scintilla/src/RESearch.cxx
+$(OBJDIR)/PropSet.o: ../../src/wxScintilla/scintilla/src/PropSet.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexAU3.o: ../../src/wxScintilla/scintilla/src/LexAU3.cxx
+$(OBJDIR)/LexHTML.o: ../../src/wxScintilla/scintilla/src/LexHTML.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexAVE.o: ../../src/wxScintilla/scintilla/src/LexAVE.cxx
+$(OBJDIR)/LexMPT.o: ../../src/wxScintilla/scintilla/src/LexMPT.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexOthers.o: ../../src/wxScintilla/scintilla/src/LexOthers.cxx
+$(OBJDIR)/LexLisp.o: ../../src/wxScintilla/scintilla/src/LexLisp.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/StyleContext.o: ../../src/wxScintilla/scintilla/src/StyleContext.cxx
+$(OBJDIR)/LexFlagship.o: ../../src/wxScintilla/scintilla/src/LexFlagship.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/WindowAccessor.o: ../../src/wxScintilla/scintilla/src/WindowAccessor.cxx
+$(OBJDIR)/LexD.o: ../../src/wxScintilla/scintilla/src/LexD.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexBasic.o: ../../src/wxScintilla/scintilla/src/LexBasic.cxx
+$(OBJDIR)/CharClassify.o: ../../src/wxScintilla/scintilla/src/CharClassify.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/PropSet.o: ../../src/wxScintilla/scintilla/src/PropSet.cxx
+$(OBJDIR)/LexSpecman.o: ../../src/wxScintilla/scintilla/src/LexSpecman.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexBash.o: ../../src/wxScintilla/scintilla/src/LexBash.cxx
+$(OBJDIR)/CellBuffer.o: ../../src/wxScintilla/scintilla/src/CellBuffer.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexHTML.o: ../../src/wxScintilla/scintilla/src/LexHTML.cxx
+$(OBJDIR)/LexGAP.o: ../../src/wxScintilla/scintilla/src/LexGAP.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexCaml.o: ../../src/wxScintilla/scintilla/src/LexCaml.cxx
+$(OBJDIR)/LexAVE.o: ../../src/wxScintilla/scintilla/src/LexAVE.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexMatlab.o: ../../src/wxScintilla/scintilla/src/LexMatlab.cxx
+$(OBJDIR)/LexOthers.o: ../../src/wxScintilla/scintilla/src/LexOthers.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexVerilog.o: ../../src/wxScintilla/scintilla/src/LexVerilog.cxx
+$(OBJDIR)/LexVHDL.o: ../../src/wxScintilla/scintilla/src/LexVHDL.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexBaan.o: ../../src/wxScintilla/scintilla/src/LexBaan.cxx
+$(OBJDIR)/LexPS.o: ../../src/wxScintilla/scintilla/src/LexPS.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexAsn1.o: ../../src/wxScintilla/scintilla/src/LexAsn1.cxx
+$(OBJDIR)/LexNsis.o: ../../src/wxScintilla/scintilla/src/LexNsis.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexMSSQL.o: ../../src/wxScintilla/scintilla/src/LexMSSQL.cxx
+$(OBJDIR)/LexBash.o: ../../src/wxScintilla/scintilla/src/LexBash.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexVHDL.o: ../../src/wxScintilla/scintilla/src/LexVHDL.cxx
+$(OBJDIR)/LexCrontab.o: ../../src/wxScintilla/scintilla/src/LexCrontab.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/ScintillaBase.o: ../../src/wxScintilla/scintilla/src/ScintillaBase.cxx
+$(OBJDIR)/Document.o: ../../src/wxScintilla/scintilla/src/Document.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/Decoration.o: ../../src/wxScintilla/scintilla/src/Decoration.cxx
+$(OBJDIR)/LexVerilog.o: ../../src/wxScintilla/scintilla/src/LexVerilog.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexPOV.o: ../../src/wxScintilla/scintilla/src/LexPOV.cxx
+$(OBJDIR)/LexLout.o: ../../src/wxScintilla/scintilla/src/LexLout.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexPS.o: ../../src/wxScintilla/scintilla/src/LexPS.cxx
+$(OBJDIR)/Indicator.o: ../../src/wxScintilla/scintilla/src/Indicator.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexTADS3.o: ../../src/wxScintilla/scintilla/src/LexTADS3.cxx
+$(OBJDIR)/LexTCL.o: ../../src/wxScintilla/scintilla/src/LexTCL.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexGui4Cli.o: ../../src/wxScintilla/scintilla/src/LexGui4Cli.cxx
+$(OBJDIR)/LexPython.o: ../../src/wxScintilla/scintilla/src/LexPython.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexCmake.o: ../../src/wxScintilla/scintilla/src/LexCmake.cxx
+$(OBJDIR)/LexRuby.o: ../../src/wxScintilla/scintilla/src/LexRuby.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexNsis.o: ../../src/wxScintilla/scintilla/src/LexNsis.cxx
+$(OBJDIR)/LexKix.o: ../../src/wxScintilla/scintilla/src/LexKix.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexCsound.o: ../../src/wxScintilla/scintilla/src/LexCsound.cxx
+$(OBJDIR)/LexMSSQL.o: ../../src/wxScintilla/scintilla/src/LexMSSQL.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexAsm.o: ../../src/wxScintilla/scintilla/src/LexAsm.cxx
+$(OBJDIR)/StyleContext.o: ../../src/wxScintilla/scintilla/src/StyleContext.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexCLW.o: ../../src/wxScintilla/scintilla/src/LexCLW.cxx
+$(OBJDIR)/LexAsm.o: ../../src/wxScintilla/scintilla/src/LexAsm.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexD.o: ../../src/wxScintilla/scintilla/src/LexD.cxx
+$(OBJDIR)/LexPLM.o: ../../src/wxScintilla/scintilla/src/LexPLM.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/KeyMap.o: ../../src/wxScintilla/scintilla/src/KeyMap.cxx
+$(OBJDIR)/ContractionState.o: ../../src/wxScintilla/scintilla/src/ContractionState.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/Document.o: ../../src/wxScintilla/scintilla/src/Document.cxx
+$(OBJDIR)/LexEiffel.o: ../../src/wxScintilla/scintilla/src/LexEiffel.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexSmalltalk.o: ../../src/wxScintilla/scintilla/src/LexSmalltalk.cxx
+$(OBJDIR)/LexCPP.o: ../../src/wxScintilla/scintilla/src/LexCPP.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexVB.o: ../../src/wxScintilla/scintilla/src/LexVB.cxx
+$(OBJDIR)/LexCSS.o: ../../src/wxScintilla/scintilla/src/LexCSS.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexGAP.o: ../../src/wxScintilla/scintilla/src/LexGAP.cxx
+$(OBJDIR)/LexCsound.o: ../../src/wxScintilla/scintilla/src/LexCsound.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/UniConversion.o: ../../src/wxScintilla/scintilla/src/UniConversion.cxx
+$(OBJDIR)/LexForth.o: ../../src/wxScintilla/scintilla/src/LexForth.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/KeyWords.o: ../../src/wxScintilla/scintilla/src/KeyWords.cxx
+$(OBJDIR)/LineMarker.o: ../../src/wxScintilla/scintilla/src/LineMarker.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/CallTip.o: ../../src/wxScintilla/scintilla/src/CallTip.cxx
+$(OBJDIR)/AutoComplete.o: ../../src/wxScintilla/scintilla/src/AutoComplete.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexLisp.o: ../../src/wxScintilla/scintilla/src/LexLisp.cxx
+$(OBJDIR)/RESearch.o: ../../src/wxScintilla/scintilla/src/RESearch.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
@@ -432,157 +432,157 @@
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexRebol.o: ../../src/wxScintilla/scintilla/src/LexRebol.cxx
+$(OBJDIR)/LexSpice.o: ../../src/wxScintilla/scintilla/src/LexSpice.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexErlang.o: ../../src/wxScintilla/scintilla/src/LexErlang.cxx
+$(OBJDIR)/UniConversion.o: ../../src/wxScintilla/scintilla/src/UniConversion.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexSpice.o: ../../src/wxScintilla/scintilla/src/LexSpice.cxx
+$(OBJDIR)/LexYAML.o: ../../src/wxScintilla/scintilla/src/LexYAML.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/Indicator.o: ../../src/wxScintilla/scintilla/src/Indicator.cxx
+$(OBJDIR)/ViewStyle.o: ../../src/wxScintilla/scintilla/src/ViewStyle.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexConf.o: ../../src/wxScintilla/scintilla/src/LexConf.cxx
+$(OBJDIR)/LexSQL.o: ../../src/wxScintilla/scintilla/src/LexSQL.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/CharClassify.o: ../../src/wxScintilla/scintilla/src/CharClassify.cxx
+$(OBJDIR)/KeyWords.o: ../../src/wxScintilla/scintilla/src/KeyWords.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexTCL.o: ../../src/wxScintilla/scintilla/src/LexTCL.cxx
+$(OBJDIR)/LexFortran.o: ../../src/wxScintilla/scintilla/src/LexFortran.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexFortran.o: ../../src/wxScintilla/scintilla/src/LexFortran.cxx
+$(OBJDIR)/LexAU3.o: ../../src/wxScintilla/scintilla/src/LexAU3.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/XPM.o: ../../src/wxScintilla/scintilla/src/XPM.cxx
+$(OBJDIR)/LexAPDL.o: ../../src/wxScintilla/scintilla/src/LexAPDL.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/ViewStyle.o: ../../src/wxScintilla/scintilla/src/ViewStyle.cxx
+$(OBJDIR)/LexCmake.o: ../../src/wxScintilla/scintilla/src/LexCmake.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexMPT.o: ../../src/wxScintilla/scintilla/src/LexMPT.cxx
+$(OBJDIR)/LexCLW.o: ../../src/wxScintilla/scintilla/src/LexCLW.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexForth.o: ../../src/wxScintilla/scintilla/src/LexForth.cxx
+$(OBJDIR)/LexTADS3.o: ../../src/wxScintilla/scintilla/src/LexTADS3.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexMMIXAL.o: ../../src/wxScintilla/scintilla/src/LexMMIXAL.cxx
+$(OBJDIR)/LexAda.o: ../../src/wxScintilla/scintilla/src/LexAda.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/RunStyles.o: ../../src/wxScintilla/scintilla/src/RunStyles.cxx
+$(OBJDIR)/LexMatlab.o: ../../src/wxScintilla/scintilla/src/LexMatlab.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexPython.o: ../../src/wxScintilla/scintilla/src/LexPython.cxx
+$(OBJDIR)/Style.o: ../../src/wxScintilla/scintilla/src/Style.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexCrontab.o: ../../src/wxScintilla/scintilla/src/LexCrontab.cxx
+$(OBJDIR)/DocumentAccessor.o: ../../src/wxScintilla/scintilla/src/DocumentAccessor.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexSpecman.o: ../../src/wxScintilla/scintilla/src/LexSpecman.cxx
+$(OBJDIR)/LexBaan.o: ../../src/wxScintilla/scintilla/src/LexBaan.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexSQL.o: ../../src/wxScintilla/scintilla/src/LexSQL.cxx
+$(OBJDIR)/CallTip.o: ../../src/wxScintilla/scintilla/src/CallTip.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexTeX.o: ../../src/wxScintilla/scintilla/src/LexTeX.cxx
+$(OBJDIR)/ScintillaBase.o: ../../src/wxScintilla/scintilla/src/ScintillaBase.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexCSS.o: ../../src/wxScintilla/scintilla/src/LexCSS.cxx
+$(OBJDIR)/LexPerl.o: ../../src/wxScintilla/scintilla/src/LexPerl.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/ExternalLexer.o: ../../src/wxScintilla/scintilla/src/ExternalLexer.cxx
+$(OBJDIR)/LexMMIXAL.o: ../../src/wxScintilla/scintilla/src/LexMMIXAL.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexMetapost.o: ../../src/wxScintilla/scintilla/src/LexMetapost.cxx
+$(OBJDIR)/LexInno.o: ../../src/wxScintilla/scintilla/src/LexInno.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexProgress.o: ../../src/wxScintilla/scintilla/src/LexProgress.cxx
+$(OBJDIR)/XPM.o: ../../src/wxScintilla/scintilla/src/XPM.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/Style.o: ../../src/wxScintilla/scintilla/src/Style.cxx
+$(OBJDIR)/LexSmalltalk.o: ../../src/wxScintilla/scintilla/src/LexSmalltalk.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexRuby.o: ../../src/wxScintilla/scintilla/src/LexRuby.cxx
+$(OBJDIR)/LexCaml.o: ../../src/wxScintilla/scintilla/src/LexCaml.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexEiffel.o: ../../src/wxScintilla/scintilla/src/LexEiffel.cxx
+$(OBJDIR)/LexTeX.o: ../../src/wxScintilla/scintilla/src/LexTeX.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/AutoComplete.o: ../../src/wxScintilla/scintilla/src/AutoComplete.cxx
+$(OBJDIR)/LexRebol.o: ../../src/wxScintilla/scintilla/src/LexRebol.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LexFlagship.o: ../../src/wxScintilla/scintilla/src/LexFlagship.cxx
+$(OBJDIR)/LexVB.o: ../../src/wxScintilla/scintilla/src/LexVB.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/LineMarker.o: ../../src/wxScintilla/scintilla/src/LineMarker.cxx
+$(OBJDIR)/ExternalLexer.o: ../../src/wxScintilla/scintilla/src/ExternalLexer.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/DocumentAccessor.o: ../../src/wxScintilla/scintilla/src/DocumentAccessor.cxx
+$(OBJDIR)/WindowAccessor.o: ../../src/wxScintilla/scintilla/src/WindowAccessor.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/PositionCache.o: ../../src/wxScintilla/scintilla/src/PositionCache.cxx
+$(OBJDIR)/LexAsn1.o: ../../src/wxScintilla/scintilla/src/LexAsn1.cxx
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
diff -Nurb wxformbuilder_3.0.57.LP/src/Makefile wxformbuilder_3.0.57.orig/src/Makefile
--- wxformbuilder_3.0.57.LP/src/Makefile	2008-04-16 04:15:40.000000000 +0200
+++ wxformbuilder_3.0.57.orig/src/Makefile	2008-04-16 17:06:00.000000000 +0200
@@ -13,8 +13,8 @@
   CPPFLAGS := -MMD -D "WXUSINGDLL_FNB" -D "TIXML_USE_TICPP" -D "NO_GCC_PRAGMA" -D "SCI_NAMESPACE" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -I "controls/include" -I "boost" -I "../src" -I "../sdk/tinyxml" -I "../sdk/plugin_interface"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -Wall -fno-strict-aliasing `wx-config --debug=no --cflags`
   CXXFLAGS := $(CFLAGS)
-  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -s -Wl,-rpath,/usr/lib/wxformbuilder `wx-config --libs` -L"../output/lib/wxformbuilder" -L"../sdk/lib" -lwx_gtk2u_flatnotebook-2.8_wxfb -lwx_gtk2u_propgrid-2.8_wxfb -lwx_gtk2u_scintilla-2.8_wxfb -lticpp -lfbPluginInterface
-  LDDEPS := ../output/lib/wxformbuilder/libwx_gtk2u_flatnotebook-2.8_wxfb.so ../output/lib/wxformbuilder/libwx_gtk2u_propgrid-2.8_wxfb.so ../output/lib/wxformbuilder/libwx_gtk2u_scintilla-2.8_wxfb.so ../sdk/lib/libticpp.a ../sdk/lib/libfbPluginInterface.a
+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -s -Wl,-rpath,/usr/lib/wxformbuilder `wx-config --libs` -L"../output/lib/wxformbuilder" -L"../sdk/lib" -l_flatnotebook-_wxfb -l_propgrid-_wxfb -l_scintilla-_wxfb -lticpp -lfbPluginInterface
+  LDDEPS := ../output/lib/wxformbuilder/lib_flatnotebook-_wxfb.so ../output/lib/wxformbuilder/lib_propgrid-_wxfb.so ../output/lib/wxformbuilder/lib_scintilla-_wxfb.so ../sdk/lib/libticpp.a ../sdk/lib/libfbPluginInterface.a
   RESFLAGS := -D "WXUSINGDLL_FNB" -D "TIXML_USE_TICPP" -D "NO_GCC_PRAGMA" -D "SCI_NAMESPACE" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -I "controls/include" -I "boost" -I "../src" -I "../sdk/tinyxml" -I "../sdk/plugin_interface"
   TARGET := wxformbuilder
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
@@ -28,57 +28,57 @@
   CPPFLAGS := -MMD -D "WXUSINGDLL_FNB" -D "TIXML_USE_TICPP" -D "NO_GCC_PRAGMA" -D "SCI_NAMESPACE" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -D "__WXFB_DEBUG__" -I "controls/include" -I "boost" -I "../src" -I "../sdk/tinyxml" -I "../sdk/plugin_interface"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -Wall -O0 `wx-config --debug=no --cflags`
   CXXFLAGS := $(CFLAGS)
-  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -Wl,-rpath,/usr/lib/wxformbuilder `wx-config --debug=no --libs` -L"../output/lib/wxformbuilder" -L"../sdk/lib" -lwx_gtk2u_flatnotebook-2.8_wxfb -lwx_gtk2u_propgrid-2.8_wxfb -lwx_gtk2u_scintilla-2.8_wxfb -lticppd -lfbPluginInterfaced
-  LDDEPS := ../output/lib/wxformbuilder/libwx_gtk2u_flatnotebook-2.8_wxfb.so ../output/lib/wxformbuilder/libwx_gtk2u_propgrid-2.8_wxfb.so ../output/lib/wxformbuilder/libwx_gtk2u_scintilla-2.8_wxfb.so ../sdk/lib/libticppd.a ../sdk/lib/libfbPluginInterfaced.a
+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -Wl,-rpath,/usr/lib/wxformbuilder `wx-config --debug=no --libs` -L"../output/lib/wxformbuilder" -L"../sdk/lib" -l_flatnotebook-_wxfb -l_propgrid-_wxfb -l_scintilla-_wxfb -lticppd -lfbPluginInterfaced
+  LDDEPS := ../output/lib/wxformbuilder/lib_flatnotebook-_wxfb.so ../output/lib/wxformbuilder/lib_propgrid-_wxfb.so ../output/lib/wxformbuilder/lib_scintilla-_wxfb.so ../sdk/lib/libticppd.a ../sdk/lib/libfbPluginInterfaced.a
   RESFLAGS := -D "WXUSINGDLL_FNB" -D "TIXML_USE_TICPP" -D "NO_GCC_PRAGMA" -D "SCI_NAMESPACE" -D "WXUSINGDLL" -D "UNICODE" -D "_UNICODE" -D "__WX__" -D "NDEBUG" -D "__WXFB_DEBUG__" -I "controls/include" -I "boost" -I "../src" -I "../sdk/tinyxml" -I "../sdk/plugin_interface"
   TARGET := wxformbuilderd
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
 
 OBJECTS := \
-	$(OBJDIR)/splashscreen.o \
 	$(OBJDIR)/maingui.o \
-	$(OBJDIR)/debug.o \
-	$(OBJDIR)/typeconv.o \
+	$(OBJDIR)/splashscreen.o \
+	$(OBJDIR)/stack.o \
+	$(OBJDIR)/xrcfilter.o \
+	$(OBJDIR)/objectbase.o \
+	$(OBJDIR)/types.o \
+	$(OBJDIR)/database.o \
+	$(OBJDIR)/stringutils.o \
 	$(OBJDIR)/wxfbipc.o \
-	$(OBJDIR)/annoyingdialog.o \
+	$(OBJDIR)/typeconv.o \
 	$(OBJDIR)/encodingutils.o \
-	$(OBJDIR)/stringutils.o \
-	$(OBJDIR)/wxfbmanager.o \
-	$(OBJDIR)/wxfbevent.o \
+	$(OBJDIR)/annoyingdialog.o \
+	$(OBJDIR)/debug.o \
+	$(OBJDIR)/palette.o \
 	$(OBJDIR)/title.o \
 	$(OBJDIR)/bitmaps.o \
-	$(OBJDIR)/appdata.o \
-	$(OBJDIR)/palette.o \
-	$(OBJDIR)/menueditor.o \
+	$(OBJDIR)/wxfbmanager.o \
+	$(OBJDIR)/customkeys.o \
 	$(OBJDIR)/mainframe.o \
-	$(OBJDIR)/about.o \
-	$(OBJDIR)/genericpanel.o \
 	$(OBJDIR)/cmdproc.o \
-	$(OBJDIR)/customkeys.o \
-	$(OBJDIR)/dataobject.o \
-	$(OBJDIR)/resizablepanel.o \
+	$(OBJDIR)/menueditor.o \
+	$(OBJDIR)/genericpanel.o \
+	$(OBJDIR)/wxfbevent.o \
+	$(OBJDIR)/appdata.o \
+	$(OBJDIR)/about.o \
+	$(OBJDIR)/geninhertclass.o \
+	$(OBJDIR)/geninhertclass_gui.o \
+	$(OBJDIR)/xrcpreview.o \
+	$(OBJDIR)/menubar.o \
 	$(OBJDIR)/visualobj.o \
 	$(OBJDIR)/innerframe.o \
-	$(OBJDIR)/menubar.o \
 	$(OBJDIR)/visualeditor.o \
+	$(OBJDIR)/resizablepanel.o \
 	$(OBJDIR)/codeeditor.o \
-	$(OBJDIR)/objecttree.o \
-	$(OBJDIR)/geninhertclass.o \
-	$(OBJDIR)/geninhertclass_gui.o \
+	$(OBJDIR)/xrcpanel.o \
 	$(OBJDIR)/objinspect.o \
-	$(OBJDIR)/xrcpreview.o \
 	$(OBJDIR)/cpppanel.o \
-	$(OBJDIR)/xrcpanel.o \
-	$(OBJDIR)/database.o \
-	$(OBJDIR)/xrcfilter.o \
-	$(OBJDIR)/types.o \
-	$(OBJDIR)/objectbase.o \
-	$(OBJDIR)/codegen.o \
+	$(OBJDIR)/objecttree.o \
+	$(OBJDIR)/dataobject.o \
 	$(OBJDIR)/codewriter.o \
 	$(OBJDIR)/cppcg.o \
+	$(OBJDIR)/codegen.o \
 	$(OBJDIR)/xrccg.o \
-	$(OBJDIR)/stack.o \
 	$(OBJDIR)/md5.o \
 
 MKDIR_TYPE := msdos
@@ -121,37 +121,37 @@
 	-@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR))
 endif
 
-$(OBJDIR)/splashscreen.o: splashscreen.cpp
+$(OBJDIR)/maingui.o: maingui.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/maingui.o: maingui.cpp
+$(OBJDIR)/splashscreen.o: splashscreen.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/debug.o: utils/debug.cpp
+$(OBJDIR)/stack.o: dbg_stack_trace/stack.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/typeconv.o: utils/typeconv.cpp
+$(OBJDIR)/xrcfilter.o: model/xrcfilter.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/wxfbipc.o: utils/wxfbipc.cpp
+$(OBJDIR)/objectbase.o: model/objectbase.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/annoyingdialog.o: utils/annoyingdialog.cpp
+$(OBJDIR)/types.o: model/types.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/encodingutils.o: utils/encodingutils.cpp
+$(OBJDIR)/database.o: model/database.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
@@ -161,27 +161,27 @@
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/wxfbmanager.o: rad/wxfbmanager.cpp
+$(OBJDIR)/wxfbipc.o: utils/wxfbipc.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/wxfbevent.o: rad/wxfbevent.cpp
+$(OBJDIR)/typeconv.o: utils/typeconv.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/title.o: rad/title.cpp
+$(OBJDIR)/encodingutils.o: utils/encodingutils.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/bitmaps.o: rad/bitmaps.cpp
+$(OBJDIR)/annoyingdialog.o: utils/annoyingdialog.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/appdata.o: rad/appdata.cpp
+$(OBJDIR)/debug.o: utils/debug.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
@@ -191,127 +191,127 @@
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/menueditor.o: rad/menueditor.cpp
+$(OBJDIR)/title.o: rad/title.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/mainframe.o: rad/mainframe.cpp
+$(OBJDIR)/bitmaps.o: rad/bitmaps.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/about.o: rad/about.cpp
+$(OBJDIR)/wxfbmanager.o: rad/wxfbmanager.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/genericpanel.o: rad/genericpanel.cpp
+$(OBJDIR)/customkeys.o: rad/customkeys.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/cmdproc.o: rad/cmdproc.cpp
+$(OBJDIR)/mainframe.o: rad/mainframe.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/customkeys.o: rad/customkeys.cpp
+$(OBJDIR)/cmdproc.o: rad/cmdproc.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/dataobject.o: rad/dataobject/dataobject.cpp
+$(OBJDIR)/menueditor.o: rad/menueditor.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/resizablepanel.o: rad/designer/resizablepanel.cpp
+$(OBJDIR)/genericpanel.o: rad/genericpanel.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/visualobj.o: rad/designer/visualobj.cpp
+$(OBJDIR)/wxfbevent.o: rad/wxfbevent.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/innerframe.o: rad/designer/innerframe.cpp
+$(OBJDIR)/appdata.o: rad/appdata.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/menubar.o: rad/designer/menubar.cpp
+$(OBJDIR)/about.o: rad/about.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/visualeditor.o: rad/designer/visualeditor.cpp
+$(OBJDIR)/geninhertclass.o: rad/geninheritclass/geninhertclass.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/codeeditor.o: rad/codeeditor/codeeditor.cpp
+$(OBJDIR)/geninhertclass_gui.o: rad/geninheritclass/geninhertclass_gui.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/objecttree.o: rad/objecttree/objecttree.cpp
+$(OBJDIR)/xrcpreview.o: rad/xrcpreview/xrcpreview.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/geninhertclass.o: rad/geninheritclass/geninhertclass.cpp
+$(OBJDIR)/menubar.o: rad/designer/menubar.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/geninhertclass_gui.o: rad/geninheritclass/geninhertclass_gui.cpp
+$(OBJDIR)/visualobj.o: rad/designer/visualobj.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/objinspect.o: rad/inspector/objinspect.cpp
+$(OBJDIR)/innerframe.o: rad/designer/innerframe.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/xrcpreview.o: rad/xrcpreview/xrcpreview.cpp
+$(OBJDIR)/visualeditor.o: rad/designer/visualeditor.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/cpppanel.o: rad/cpppanel/cpppanel.cpp
+$(OBJDIR)/resizablepanel.o: rad/designer/resizablepanel.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/xrcpanel.o: rad/xrcpanel/xrcpanel.cpp
+$(OBJDIR)/codeeditor.o: rad/codeeditor/codeeditor.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/database.o: model/database.cpp
+$(OBJDIR)/xrcpanel.o: rad/xrcpanel/xrcpanel.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/xrcfilter.o: model/xrcfilter.cpp
+$(OBJDIR)/objinspect.o: rad/inspector/objinspect.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/types.o: model/types.cpp
+$(OBJDIR)/cpppanel.o: rad/cpppanel/cpppanel.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/objectbase.o: model/objectbase.cpp
+$(OBJDIR)/objecttree.o: rad/objecttree/objecttree.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/codegen.o: codegen/codegen.cpp
+$(OBJDIR)/dataobject.o: rad/dataobject/dataobject.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
@@ -326,12 +326,12 @@
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/xrccg.o: codegen/xrccg.cpp
+$(OBJDIR)/codegen.o: codegen/codegen.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
-$(OBJDIR)/stack.o: dbg_stack_trace/stack.cpp
+$(OBJDIR)/xrccg.o: codegen/xrccg.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<