Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to Scintilla 1.54

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/samples/stc/makefile.bcc
View File

@@ -30,7 +30,9 @@ STCTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\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
### Conditionally set variables: ###
@@ -152,7 +154,13 @@ $(OBJS):
### Targets: ###
all: $(OBJS)\stctest.exe data
all: $(OBJS)\stctest.exe
$(OBJS)\stctest_edit.obj: .\edit.cpp
$(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) $**
$(OBJS)\stctest_prefs.obj: .\prefs.cpp
$(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) $**
$(OBJS)\stctest_sample.res: .\..\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples $**
@@ -170,10 +178,6 @@ clean:
-if exist $(OBJS)\stctest.ilf del $(OBJS)\stctest.ilf
-if exist $(OBJS)\stctest.ils del $(OBJS)\stctest.ils
data:
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
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
c0w32.obj $(STCTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\stctest_sample.res