Updated to Scintilla 1.54

Applied most of patch #806092
Added new wxSTC sample from Otto Wyss


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-09-18 05:05:52 +00:00
parent a47ae718e2
commit 88a8b04e9c
136 changed files with 9108 additions and 1232 deletions

View File

@@ -169,7 +169,9 @@ STCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
$(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. &
$(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS)
STCTEST_OBJECTS = &
$(OBJS)\stctest_stctest.obj
$(OBJS)\stctest_stctest.obj &
$(OBJS)\stctest_edit.obj &
$(OBJS)\stctest_prefs.obj
all : $(OBJS)
@@ -178,7 +180,13 @@ $(OBJS) :
### Targets: ###
all : .SYMBOLIC $(OBJS)\stctest.exe data
all : .SYMBOLIC $(OBJS)\stctest.exe
$(OBJS)\stctest_edit.obj : .AUTODEPEND .\edit.cpp
$(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
$(OBJS)\stctest_prefs.obj : .AUTODEPEND .\prefs.cpp
$(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
$(OBJS)\stctest_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<
@@ -193,10 +201,6 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\stctest.exe : $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
@%create $(OBJS)\stctest.lbc
@%append $(OBJS)\stctest.lbc option quiet