Removing deprecated classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -11,7 +11,14 @@ WXDIR = $(WXWIN)
|
||||
|
||||
LIBTARGET=$(WXDIR)\lib\wxdeprecated.lib
|
||||
|
||||
OBJECTS = prop.obj propform.obj proplist.obj y_tab.obj resource.obj treelay.obj
|
||||
OBJECTS = prop.obj propform.obj proplist.obj dosyacc.obj resource.obj treelay.obj
|
||||
|
||||
!include $(WXDIR)\src\makelib.b32
|
||||
|
||||
#$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c
|
||||
# copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
|
||||
#
|
||||
#$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
|
||||
# copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
|
||||
#
|
||||
|
||||
|
@@ -10,7 +10,50 @@
|
||||
WXDIR = ../../..
|
||||
|
||||
LIBTARGET=$(WXDIR)/lib/libwxdeprecated.a
|
||||
OBJECTS = prop.o propform.o proplist.o y_tab.o resource.o treelay.o
|
||||
OBJECTS = prop.o propform.o proplist.o dosyacc.o resource.o treelay.o
|
||||
|
||||
include $(WXDIR)/src/makelib.g95
|
||||
|
||||
dosyacc.$(OBJSUFF): dosyacc.c doslex.c
|
||||
$(CCLEX) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ dosyacc.c
|
||||
|
||||
#$(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
|
||||
# $(CCLEX) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
|
||||
#
|
||||
#$(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c
|
||||
# $(COPY) ../common/dosyacc.c ../common/y_tab.c
|
||||
#
|
||||
#$(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c
|
||||
# $(COPY) ../common/doslex.c ../common/lex_yy.c
|
||||
|
||||
# Replace lex with flex if you run into compilation
|
||||
# problems with lex_yy.c. See also note about LEX_SCANNER
|
||||
# above.
|
||||
# $(COMMDIR)/lex_yy.c: $(COMMDIR)/lexer.l
|
||||
# $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
|
||||
#
|
||||
# Try one of these if the above line doesn't work.
|
||||
# Alternative syntax (1)
|
||||
# $(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
|
||||
# Alternative syntax (2)
|
||||
# $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
|
||||
#
|
||||
# sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
|
||||
# sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
|
||||
# sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
|
||||
# rm -f lex.yy.c
|
||||
#
|
||||
# Replace yacc with bison if you run into compilation
|
||||
# problems with y_tab.c.
|
||||
#
|
||||
# $(COMMDIR)/y_tab.c: $(COMMDIR)/parser.y
|
||||
# $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
|
||||
#
|
||||
# If you use e.g. gcc on Unix, uncomment these lines
|
||||
# and comment out the above.
|
||||
#
|
||||
# $(COMMDIR)/y_tab.c: $(COMMDIR)/parser.y
|
||||
# $(YACC) $(COMMDIR)/parser.y
|
||||
# mv y.tab.c $(COMMDIR)/y_tab.c
|
||||
|
||||
|
||||
|
@@ -32,7 +32,19 @@ LIBEXT=d
|
||||
LIBTARGET=$(WXDIR)\lib\wxdeprecated$(LIBEXT).lib
|
||||
EXTRATARGETS=$(D)
|
||||
|
||||
OBJECTS=$(D)\prop.obj $(D)\propform.obj $(D)\proplist.obj $(D)\y_tab.obj $(D)\resource.obj $(D)\treelay.obj
|
||||
OBJECTS=$(D)\prop.obj $(D)\propform.obj $(D)\proplist.obj $(D)\dosyacc.obj $(D)\resource.obj $(D)\treelay.obj
|
||||
|
||||
!include $(WXDIR)\src\makelib.vc
|
||||
|
||||
$D\dosyacc.obj: dosyacc.c doslex.c
|
||||
cl @<<
|
||||
$(CPPFLAGS2) /c dosyacc.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
|
||||
<<
|
||||
|
||||
#$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c
|
||||
# copy "$(COMMDIR)"\dosyacc.c "$(COMMDIR)"\y_tab.c
|
||||
|
||||
#$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
|
||||
# copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user