diff options
| author | Bernard Normier <bernard@zeroc.com> | 2015-02-04 14:58:12 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2015-02-04 14:58:12 -0500 |
| commit | a6790dfe19bf2d22f388b6dba06dc83aa7c1a249 (patch) | |
| tree | 021a8cc14eec71e29cf0b6786b318f7577d0bd29 /cpp/src/FreezeScript | |
| parent | Removed IceGrid discovery plugin compilation from WinRT build (diff) | |
| download | ice-a6790dfe19bf2d22f388b6dba06dc83aa7c1a249.tar.bz2 ice-a6790dfe19bf2d22f388b6dba06dc83aa7c1a249.tar.xz ice-a6790dfe19bf2d22f388b6dba06dc83aa7c1a249.zip | |
Fixed ICE-5942: set BISON_FLEX=yes to compile scanner and grammar files with flex and bison
Diffstat (limited to 'cpp/src/FreezeScript')
| -rw-r--r-- | cpp/src/FreezeScript/Makefile.mak | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak index 1df8776015f..53498deb1d4 100644 --- a/cpp/src/FreezeScript/Makefile.mak +++ b/cpp/src/FreezeScript/Makefile.mak @@ -14,16 +14,18 @@ DUMPDB = $(top_srcdir)\bin\dumpdb.exe TARGETS = $(TRANSFORMDB) $(DUMPDB) -COMMON_OBJS = .\Grammar.obj \ - .\Scanner.obj \ - .\AssignVisitor.obj \ +BISON_FLEX_OBJS = .\Grammar.obj \ + .\Scanner.obj + +COMMON_OBJS = .\AssignVisitor.obj \ .\Data.obj \ .\Error.obj \ .\Functions.obj \ .\Exception.obj \ .\Parser.obj \ .\Print.obj \ - .\Util.obj + .\Util.obj \ + $(BISON_FLEX_OBJS) TRANSFORM_OBJS = .\TransformAnalyzer.obj \ .\TransformVisitor.obj \ @@ -40,6 +42,8 @@ HDIR = $(headerdir)\FreezeScript !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +BISONFLAGS = --name-prefix "freeze_script_" $(BISONFLAGS) + LINKWITH = $(LIBS) $(DB_LIBS) !if "$(GENERATE_PDB)" == "yes" @@ -62,20 +66,6 @@ $(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest -Scanner.cpp : Scanner.l - flex Scanner.l - del /q $@ - echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp - type lex.yy.c >> Scanner.cpp - del /q lex.yy.c - -Grammar.cpp Grammar.h: Grammar.y - del /q Grammar.h Grammar.cpp - bison -dvt --name-prefix "freeze_script_" Grammar.y - move Grammar.tab.c Grammar.cpp - move Grammar.tab.h Grammar.h - del /q Grammar.output - clean:: -del /q $(TRANSFORMDB:.exe=.*) -del /q $(DUMPDB:.exe=.*) |