diff --git a/wmake/rules/General/coco-cpp b/wmake/rules/General/coco-cpp index 77448d40f5..94264971dc 100644 --- a/wmake/rules/General/coco-cpp +++ b/wmake/rules/General/coco-cpp @@ -8,7 +8,6 @@ atgtoo = \ $(WM_THIRD_PARTY_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)/coco-cpp/bin/coco-cpp \ -single \ - -frames $(WM_THIRD_PARTY_DIR)/platforms/share/coco-cpp \ $$SOURCE -o $(OBJECTS_DIR) && \ $(CC) $(c++FLAGS) -c $*.cpp -o $@ diff --git a/wmake/src/makeParserCode b/wmake/src/makeParserCode index 801cf057fd..1feb1fe6ed 100755 --- a/wmake/src/makeParserCode +++ b/wmake/src/makeParserCode @@ -34,7 +34,7 @@ cd ${0%/*} || exit 1 # run from this directory bindir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/coco-cpp/bin -frames=$WM_THIRD_PARTY_DIR/platforms/share/coco-cpp +frames=$bindir/../share/coco-cpp [ -d "$bindir" -a -x "$bindir/coco-cpp" ] || { echo "no coco-cpp binary found" @@ -47,8 +47,7 @@ frames=$WM_THIRD_PARTY_DIR/platforms/share/coco-cpp } # run coco-cpp: - -$bindir/coco-cpp -frames $frames wmkdependParser.atg +$bindir/coco-cpp wmkdependParser.atg echo echo Done diff --git a/wmake/src/wmkdependParser.atg b/wmake/src/wmkdependParser.atg index d485a84c5d..d69a8c1edf 100644 --- a/wmake/src/wmkdependParser.atg +++ b/wmake/src/wmkdependParser.atg @@ -2,10 +2,6 @@ Attributed Grammar for Coco/R (-*- C++ -*- version) compile with: coco-cpp wmkdependParser.atg - For example, - $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/coco-cpp/bin/coco-cpp \ - -frames $WM_THIRD_PARTY_DIR/platforms/share/coco-cpp \ - wmkdependParser.atg \*---------------------------------------------------------------------------*/ [copy] /*---------------------------------*- C++ -*---------------------------------*\ diff --git a/wmake/src/wmkdependParser.cpp b/wmake/src/wmkdependParser.cpp index 8d59a862bb..0f3712aeee 100644 --- a/wmake/src/wmkdependParser.cpp +++ b/wmake/src/wmkdependParser.cpp @@ -32,7 +32,7 @@ SourceFiles generated \*---------------------------------------------------------------------------*/ -// This file was generated with Coco/R C++ (7 Feb 2010) +// This file was generated with Coco/R C++ (10 Mar 2010) // http://www.ssw.uni-linz.ac.at/coco/ // with these defines: // - FORCE_UTF8 diff --git a/wmake/src/wmkdependParser.h b/wmake/src/wmkdependParser.h index df807bd10f..cd772ea502 100644 --- a/wmake/src/wmkdependParser.h +++ b/wmake/src/wmkdependParser.h @@ -32,7 +32,7 @@ SourceFiles generated \*---------------------------------------------------------------------------*/ -// This file was generated with Coco/R C++ (7 Feb 2010) +// This file was generated with Coco/R C++ (10 Mar 2010) // http://www.ssw.uni-linz.ac.at/coco/ // with these defines: // - FORCE_UTF8 diff --git a/wmake/src/wmkdependScanner.cpp b/wmake/src/wmkdependScanner.cpp index 72f082f788..01cd985b05 100644 --- a/wmake/src/wmkdependScanner.cpp +++ b/wmake/src/wmkdependScanner.cpp @@ -32,7 +32,7 @@ SourceFiles generated \*---------------------------------------------------------------------------*/ -// This file was generated with Coco/R C++ (7 Feb 2010) +// This file was generated with Coco/R C++ (10 Mar 2010) // http://www.ssw.uni-linz.ac.at/coco/ // with these defines: // - FORCE_UTF8 diff --git a/wmake/src/wmkdependScanner.h b/wmake/src/wmkdependScanner.h index 7520b01ebd..8b9ee581c3 100644 --- a/wmake/src/wmkdependScanner.h +++ b/wmake/src/wmkdependScanner.h @@ -32,7 +32,7 @@ SourceFiles generated \*---------------------------------------------------------------------------*/ -// This file was generated with Coco/R C++ (7 Feb 2010) +// This file was generated with Coco/R C++ (10 Mar 2010) // http://www.ssw.uni-linz.ac.at/coco/ // with these defines: // - FORCE_UTF8