merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -10,13 +10,13 @@ RES_PROGRAM = $(PROGRAM)_resources.o
RES_PROGRAM_OPT = @RESPROGRAM@
.c.o :
$(CCC) -c $(CFLAGS) -o $@ $<
$(CCC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
.cpp.o :
$(CC) -c $(CPPFLAGS) -o $@ $<
$(CC) -c $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
.cxx.o :
$(CC) -c $(CPPFLAGS) -o $@ $<
$(CC) -c $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
# the comment at the end of the next line is needed because otherwise autoconf
# would remove this line completely - it contains a built-in hack to remove