-diff -ruN --new-file muparser-v2_2_3/CMakeLists.txt muparser-v2_2_3-new/CMakeLists.txt
+diff -ruN muparser-v2_2_3/build/makefile.vc muparser-v2_2_3-new/build/makefile.vc
+--- muparser-v2_2_3/build/makefile.vc	2011-11-19 23:49:50.000000000 -0700
++++ muparser-v2_2_3-new/build/makefile.vc	2014-11-08 06:56:11.428331100 -0700
+@@ -1,322 +1,322 @@
+-# =========================================================================
+-#     This makefile was generated by
+-#     Bakefile 0.2.9 (http://www.bakefile.org)
+-#     Do not modify, all changes will be overwritten!
+-# =========================================================================
+-
+-
+-
+-# -------------------------------------------------------------------------
+-# These are configurable options:
+-# -------------------------------------------------------------------------
+-
+-# C compiler 
+-CC = cl
+-
+-# C++ compiler 
+-CXX = cl
+-
+-# Standard flags for CC 
+-CFLAGS = 
+-
+-# Standard flags for C++ 
+-CXXFLAGS = 
+-
+-# Standard preprocessor flags (common for CC and CXX) 
+-CPPFLAGS = 
+-
+-# Standard linker flags 
+-LDFLAGS = 
+-
+-# Set to 1 to build debug version [0,1]
+-#   0 - Release
+-#   1 - Debug
+-DEBUG = 0
+-
+-# Set to 1 to build shared (DLL) version [0,1]
+-#   0 - Static
+-#   1 - DLL
+-SHARED = 0
+-
+-# Set to 1 to compile samples [0,1]
+-SAMPLES = 1
+-
+-
+-
+-# -------------------------------------------------------------------------
+-# Do not modify the rest of this file!
+-# -------------------------------------------------------------------------
+-
+-### Variables: ###
+-
+-MUPARSER_LIB_CXXFLAGS = /MD$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
+-	$(____DEBUG_9) /Fd..\lib\muparser$(DEBUG_3).pdb $(____DEBUG_6) \
+-	$(______DEBUG) $(____SHARED) $(____SHARED_0) /D_WIN32 /I..\include /GR /EHsc \
+-	$(CPPFLAGS) $(CXXFLAGS)
+-MUPARSER_LIB_OBJECTS =  \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParser.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBase.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBytecode.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserCallback.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserDLL.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserError.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserInt.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTest.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTokenReader.obj
+-MUPARSER_DLL_CXXFLAGS = /MD$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
+-	$(____DEBUG_9) /Fd..\lib\muparser$(DEBUG_3).pdb $(____DEBUG_6) \
+-	$(______DEBUG) $(____SHARED) $(____SHARED_0) /D_WIN32 /I..\include /GR /EHsc \
+-	$(CPPFLAGS) $(CXXFLAGS)
+-MUPARSER_DLL_OBJECTS =  \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParser.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBase.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBytecode.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserCallback.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserDLL.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserError.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserInt.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTest.obj \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTokenReader.obj
+-EXAMPLE1_CXXFLAGS = /MD$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
+-	$(____DEBUG_9) /Fd..\samples\example1\example1.pdb $(____DEBUG_6) \
+-	$(______DEBUG) /I..\include $(____SHARED_1) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
+-EXAMPLE1_OBJECTS =  \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example1_example1.obj
+-EXAMPLE2_CFLAGS = /MD$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
+-	$(____DEBUG_9) /Fd..\samples\example2\example2.pdb $(____DEBUG_6) \
+-	$(______DEBUG) /I..\include $(____SHARED_1) $(CPPFLAGS) $(CFLAGS)
+-EXAMPLE2_OBJECTS =  \
+-	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example2_example2.obj
+-
+-### Conditionally set variables: ###
+-
+-!if "$(DEBUG)" == "0"
+-DEBUGBUILDPOSTFIX = rel
+-!endif
+-!if "$(DEBUG)" == "1"
+-DEBUGBUILDPOSTFIX = dbg
+-!endif
+-!if "$(SHARED)" == "0"
+-SHAREDBUILDPOSTFIX = static
+-!endif
+-!if "$(SHARED)" == "1"
+-SHAREDBUILDPOSTFIX = shared
+-!endif
+-!if "$(SHARED)" == "0"
+-__muParser_lib___depname = ..\lib\muparser$(DEBUG_3).lib
+-!endif
+-!if "$(SHARED)" == "1"
+-__muParser_dll___depname = ..\lib\muparser$(DEBUG_3).dll
+-!endif
+-!if "$(DEBUG)" == "0"
+-____DEBUG_23_26 = 
+-!endif
+-!if "$(DEBUG)" == "1"
+-____DEBUG_23_26 = $(____DEBUG_10)
+-!endif
+-!if "$(SAMPLES)" == "1" && "$(SHARED)" == "0"
+-__example1___depname = ..\samples\example1\example1.exe
+-!endif
+-!if "$(DEBUG)" == "0"
+-____DEBUG_40_43 = 
+-!endif
+-!if "$(DEBUG)" == "1"
+-____DEBUG_40_43 = $(____DEBUG_10)
+-!endif
+-!if "$(SAMPLES)" == "1" && "$(SHARED)" == "1"
+-__example2___depname = ..\samples\example2\example2.exe
+-!endif
+-!if "$(DEBUG)" == "0"
+-____DEBUG_56_59 = 
+-!endif
+-!if "$(DEBUG)" == "1"
+-____DEBUG_56_59 = $(____DEBUG_10)
+-!endif
+-!if "$(SHARED)" == "0"
+-____SHARED = 
+-!endif
+-!if "$(SHARED)" == "1"
+-____SHARED = /DMUPARSER_DLL
+-!endif
+-!if "$(SHARED)" == "0"
+-____SHARED_0 = 
+-!endif
+-!if "$(SHARED)" == "1"
+-____SHARED_0 = /DMUPARSERLIB_EXPORTS
+-!endif
+-!if "$(DEBUG)" == "0"
+-____DEBUG_8 = /DNDEBUG
+-!endif
+-!if "$(DEBUG)" == "1"
+-____DEBUG_8 = 
+-!endif
+-!if "$(DEBUG)" == "0"
+-____DEBUG = /O2
+-!endif
+-!if "$(DEBUG)" == "1"
+-____DEBUG = /Od
+-!endif
+-!if "$(DEBUG)" == "0"
+-____DEBUG_9 = 
+-!endif
+-!if "$(DEBUG)" == "1"
+-____DEBUG_9 = /Zi
+-!endif
+-!if "$(DEBUG)" == "0"
+-____DEBUG_5 = 
+-!endif
+-!if "$(DEBUG)" == "1"
+-____DEBUG_5 = /DEBUG
+-!endif
+-!if "$(DEBUG)" == "0"
+-____DEBUG_6 = /w
+-!endif
+-!if "$(DEBUG)" == "1"
+-____DEBUG_6 = /W4
+-!endif
+-!if "$(DEBUG)" == "0"
+-______DEBUG = 
+-!endif
+-!if "$(DEBUG)" == "1"
+-______DEBUG = /D_DEBUG
+-!endif
+-!if "$(DEBUG)" == "0"
+-DEBUG_3 = 
+-!endif
+-!if "$(DEBUG)" == "1"
+-DEBUG_3 = d
+-!endif
+-!if "$(DEBUG)" == "0"
+-____DEBUG_10 = /opt:ref /opt:icf
+-!endif
+-!if "$(DEBUG)" == "1"
+-____DEBUG_10 = 
+-!endif
+-!if "$(SHARED)" == "0"
+-____SHARED_1 = 
+-!endif
+-!if "$(SHARED)" == "1"
+-____SHARED_1 = /DUSINGDLL
+-!endif
+-
+-
+-all: obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX):
+-	-if not exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX) mkdir obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)
+-
+-### Targets: ###
+-
+-all: $(__muParser_lib___depname) $(__muParser_dll___depname) $(__example1___depname) $(__example2___depname)
+-
+-clean: 
+-	-if exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.obj del obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.obj
+-	-if exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.res del obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.res
+-	-if exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.pch del obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.pch
+-	-if exist ..\lib\muparser$(DEBUG_3).lib del ..\lib\muparser$(DEBUG_3).lib
+-	-if exist ..\lib\muparser$(DEBUG_3).dll del ..\lib\muparser$(DEBUG_3).dll
+-	-if exist ..\lib\muparser$(DEBUG_3).ilk del ..\lib\muparser$(DEBUG_3).ilk
+-	-if exist ..\lib\muparser$(DEBUG_3).pdb del ..\lib\muparser$(DEBUG_3).pdb
+-	-if exist ..\lib\muparser$(DEBUG_3).lib del ..\lib\muparser$(DEBUG_3).lib
+-	-if exist ..\samples\example1\example1.exe del ..\samples\example1\example1.exe
+-	-if exist ..\samples\example1\example1.ilk del ..\samples\example1\example1.ilk
+-	-if exist ..\samples\example1\example1.pdb del ..\samples\example1\example1.pdb
+-	-if exist ..\samples\example2\example2.exe del ..\samples\example2\example2.exe
+-	-if exist ..\samples\example2\example2.ilk del ..\samples\example2\example2.ilk
+-	-if exist ..\samples\example2\example2.pdb del ..\samples\example2\example2.pdb
+-
+-!if "$(SHARED)" == "0"
+-..\lib\muparser$(DEBUG_3).lib: $(MUPARSER_LIB_OBJECTS)
+-	if exist $@ del $@
+-	link /LIB /NOLOGO /OUT:$@ @<<
+-	$(MUPARSER_LIB_OBJECTS)
+-<<
+-!endif
+-
+-!if "$(SHARED)" == "1"
+-..\lib\muparser$(DEBUG_3).dll: $(MUPARSER_DLL_OBJECTS)
+-	link /DLL /NOLOGO /OUT:$@  $(____DEBUG_5) /pdb:"..\lib\muparser$(DEBUG_3).pdb" $(____DEBUG_23_26) $(LDFLAGS) @<<
+-	$(MUPARSER_DLL_OBJECTS)   /IMPLIB:..\lib\muparser$(DEBUG_3).lib
+-<<
+-!endif
+-
+-!if "$(SAMPLES)" == "1" && "$(SHARED)" == "0"
+-..\samples\example1\example1.exe: $(EXAMPLE1_OBJECTS) $(__muParser_lib___depname)
+-	link /NOLOGO /OUT:$@  $(____DEBUG_5) /pdb:"..\samples\example1\example1.pdb" $(____DEBUG_40_43) /LIBPATH:..\lib $(LDFLAGS) @<<
+-	$(EXAMPLE1_OBJECTS)   ..\lib\muparser$(DEBUG_3).lib
+-<<
+-!endif
+-
+-!if "$(SAMPLES)" == "1" && "$(SHARED)" == "1"
+-..\samples\example2\example2.exe: $(EXAMPLE2_OBJECTS) $(__muParser_lib___depname)
+-	link /NOLOGO /OUT:$@  $(____DEBUG_5) /pdb:"..\samples\example2\example2.pdb" $(____DEBUG_56_59) /LIBPATH:..\lib $(LDFLAGS) @<<
+-	$(EXAMPLE2_OBJECTS)   ..\lib\muparser$(DEBUG_3).lib
+-<<
+-!endif
+-
+-lib: $(__muParser_lib___depname) $(__muParser_dll___depname)
+-
+-samples: $(__example1___depname) $(__example2___depname)
+-
+-documentation: 
+-	( cd ..\docs && doxygen )
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParser.obj: ..\src\muParser.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParser.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBase.obj: ..\src\muParserBase.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserBase.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBytecode.obj: ..\src\muParserBytecode.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserBytecode.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserCallback.obj: ..\src\muParserCallback.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserCallback.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserDLL.obj: ..\src\muParserDLL.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserDLL.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserError.obj: ..\src\muParserError.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserError.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserInt.obj: ..\src\muParserInt.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserInt.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTest.obj: ..\src\muParserTest.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserTest.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTokenReader.obj: ..\src\muParserTokenReader.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserTokenReader.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParser.obj: ..\src\muParser.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParser.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBase.obj: ..\src\muParserBase.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserBase.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBytecode.obj: ..\src\muParserBytecode.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserBytecode.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserCallback.obj: ..\src\muParserCallback.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserCallback.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserDLL.obj: ..\src\muParserDLL.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserDLL.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserError.obj: ..\src\muParserError.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserError.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserInt.obj: ..\src\muParserInt.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserInt.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTest.obj: ..\src\muParserTest.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserTest.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTokenReader.obj: ..\src\muParserTokenReader.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserTokenReader.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example1_example1.obj: ..\samples\example1\example1.cpp
+-	$(CXX) /c /nologo /TP /Fo$@ $(EXAMPLE1_CXXFLAGS) ..\samples\example1\example1.cpp
+-
+-obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example2_example2.obj: ..\samples\example2\example2.c
+-	$(CC) /c /nologo /TC /Fo$@ $(EXAMPLE2_CFLAGS) ..\samples\example2\example2.c
+-
++# =========================================================================
++#     This makefile was generated by
++#     Bakefile 0.2.9 (http://www.bakefile.org)
++#     Do not modify, all changes will be overwritten!
++# =========================================================================
++
++
++
++# -------------------------------------------------------------------------
++# These are configurable options:
++# -------------------------------------------------------------------------
++
++# C compiler 
++CC = cl
++
++# C++ compiler 
++CXX = cl
++
++# Standard flags for CC 
++CFLAGS = 
++
++# Standard flags for C++ 
++CXXFLAGS = 
++
++# Standard preprocessor flags (common for CC and CXX) 
++CPPFLAGS = 
++
++# Standard linker flags 
++LDFLAGS = 
++
++# Set to 1 to build debug version [0,1]
++#   0 - Release
++#   1 - Debug
++DEBUG = 0
++
++# Set to 1 to build shared (DLL) version [0,1]
++#   0 - Static
++#   1 - DLL
++SHARED = 0
++
++# Set to 1 to compile samples [0,1]
++SAMPLES = 1
++
++
++
++# -------------------------------------------------------------------------
++# Do not modify the rest of this file!
++# -------------------------------------------------------------------------
++
++### Variables: ###
++
++MUPARSER_LIB_CXXFLAGS = /MD$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
++	$(____DEBUG_9) /Fdmuparser$(DEBUG_3).pdb $(____DEBUG_6) \
++	$(______DEBUG) $(____SHARED) $(____SHARED_0) /D_WIN32 /I..\include /GR /EHsc \
++	$(CPPFLAGS) $(CXXFLAGS)
++MUPARSER_LIB_OBJECTS =  \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParser.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBase.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBytecode.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserCallback.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserDLL.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserError.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserInt.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTest.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTokenReader.obj
++MUPARSER_DLL_CXXFLAGS = /MD$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
++	$(____DEBUG_9) /Fdmuparser$(DEBUG_3).pdb $(____DEBUG_6) \
++	$(______DEBUG) $(____SHARED) $(____SHARED_0) /D_WIN32 /I..\include /GR /EHsc \
++	$(CPPFLAGS) $(CXXFLAGS)
++MUPARSER_DLL_OBJECTS =  \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParser.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBase.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBytecode.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserCallback.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserDLL.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserError.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserInt.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTest.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTokenReader.obj
++EXAMPLE1_CXXFLAGS = /MD$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
++	$(____DEBUG_9) /Fdexample1\example1.pdb $(____DEBUG_6) \
++	$(______DEBUG) /I..\include $(____SHARED_1) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
++EXAMPLE1_OBJECTS =  \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example1_example1.obj
++EXAMPLE2_CFLAGS = /MD$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
++	$(____DEBUG_9) /Fdexample2\example2.pdb $(____DEBUG_6) \
++	$(______DEBUG) /I..\include $(____SHARED_1) $(CPPFLAGS) $(CFLAGS)
++EXAMPLE2_OBJECTS =  \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example2_example2.obj
++
++### Conditionally set variables: ###
++
++!if "$(DEBUG)" == "0"
++DEBUGBUILDPOSTFIX = rel
++!endif
++!if "$(DEBUG)" == "1"
++DEBUGBUILDPOSTFIX = dbg
++!endif
++!if "$(SHARED)" == "0"
++SHAREDBUILDPOSTFIX = static
++!endif
++!if "$(SHARED)" == "1"
++SHAREDBUILDPOSTFIX = shared
++!endif
++!if "$(SHARED)" == "0"
++__muParser_lib___depname = muparser$(DEBUG_3).lib
++!endif
++!if "$(SHARED)" == "1"
++__muParser_dll___depname = muparser$(DEBUG_3).dll
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_23_26 = 
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_23_26 = $(____DEBUG_10)
++!endif
++!if "$(SAMPLES)" == "1" && "$(SHARED)" == "0"
++__example1___depname = example1\example1.exe
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_40_43 = 
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_40_43 = $(____DEBUG_10)
++!endif
++!if "$(SAMPLES)" == "1" && "$(SHARED)" == "1"
++__example2___depname = example2\example2.exe
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_56_59 = 
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_56_59 = $(____DEBUG_10)
++!endif
++!if "$(SHARED)" == "0"
++____SHARED = 
++!endif
++!if "$(SHARED)" == "1"
++____SHARED = /DMUPARSER_DLL
++!endif
++!if "$(SHARED)" == "0"
++____SHARED_0 = 
++!endif
++!if "$(SHARED)" == "1"
++____SHARED_0 = /DMUPARSERLIB_EXPORTS
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_8 = /DNDEBUG
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_8 = 
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG = /O2
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG = /Od
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_9 = 
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_9 = /Zi
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_5 = 
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_5 = /DEBUG
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_6 = /w
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_6 = /W4
++!endif
++!if "$(DEBUG)" == "0"
++______DEBUG = 
++!endif
++!if "$(DEBUG)" == "1"
++______DEBUG = /D_DEBUG
++!endif
++!if "$(DEBUG)" == "0"
++DEBUG_3 = 
++!endif
++!if "$(DEBUG)" == "1"
++DEBUG_3 = d
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_10 = /opt:ref /opt:icf
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_10 = 
++!endif
++!if "$(SHARED)" == "0"
++____SHARED_1 = 
++!endif
++!if "$(SHARED)" == "1"
++____SHARED_1 = /DUSINGDLL
++!endif
++
++
++all: obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX):
++	-if not exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX) mkdir obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)
++
++### Targets: ###
++
++all: $(__muParser_lib___depname) $(__muParser_dll___depname) $(__example1___depname) $(__example2___depname)
++
++clean: 
++	-if exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.obj del obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.obj
++	-if exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.res del obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.res
++	-if exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.pch del obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.pch
++	-if exist muparser$(DEBUG_3).lib del muparser$(DEBUG_3).lib
++	-if exist muparser$(DEBUG_3).dll del muparser$(DEBUG_3).dll
++	-if exist muparser$(DEBUG_3).ilk del muparser$(DEBUG_3).ilk
++	-if exist muparser$(DEBUG_3).pdb del muparser$(DEBUG_3).pdb
++	-if exist muparser$(DEBUG_3).lib del muparser$(DEBUG_3).lib
++	-if exist example1\example1.exe del example1\example1.exe
++	-if exist example1\example1.ilk del example1\example1.ilk
++	-if exist example1\example1.pdb del example1\example1.pdb
++	-if exist example2\example2.exe del example2\example2.exe
++	-if exist example2\example2.ilk del example2\example2.ilk
++	-if exist example2\example2.pdb del example2\example2.pdb
++
++!if "$(SHARED)" == "0"
++muparser$(DEBUG_3).lib: $(MUPARSER_LIB_OBJECTS)
++	if exist $@ del $@
++	link /LIB /NOLOGO /OUT:$@ @<<
++	$(MUPARSER_LIB_OBJECTS)
++<<
++!endif
++
++!if "$(SHARED)" == "1"
++muparser$(DEBUG_3).dll: $(MUPARSER_DLL_OBJECTS)
++	link /DLL /NOLOGO /OUT:$@  $(____DEBUG_5) /pdb:"muparser$(DEBUG_3).pdb" $(____DEBUG_23_26) $(LDFLAGS) @<<
++	$(MUPARSER_DLL_OBJECTS)   /IMPLIB:muparser$(DEBUG_3).lib
++<<
++!endif
++
++!if "$(SAMPLES)" == "1" && "$(SHARED)" == "0"
++example1\example1.exe: $(EXAMPLE1_OBJECTS) $(__muParser_lib___depname)
++	link /NOLOGO /OUT:$@  $(____DEBUG_5) /pdb:"example1\example1.pdb" $(____DEBUG_40_43) /LIBPATH:..\lib $(LDFLAGS) @<<
++	$(EXAMPLE1_OBJECTS)   muparser$(DEBUG_3).lib
++<<
++!endif
++
++!if "$(SAMPLES)" == "1" && "$(SHARED)" == "1"
++example2\example2.exe: $(EXAMPLE2_OBJECTS) $(__muParser_lib___depname)
++	link /NOLOGO /OUT:$@  $(____DEBUG_5) /pdb:"example2\example2.pdb" $(____DEBUG_56_59) /LIBPATH:..\lib $(LDFLAGS) @<<
++	$(EXAMPLE2_OBJECTS)   muparser$(DEBUG_3).lib
++<<
++!endif
++
++lib: $(__muParser_lib___depname) $(__muParser_dll___depname)
++
++samples: $(__example1___depname) $(__example2___depname)
++
++documentation: 
++	( cd ..\docs && doxygen )
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParser.obj: ..\src\muParser.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParser.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBase.obj: ..\src\muParserBase.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserBase.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBytecode.obj: ..\src\muParserBytecode.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserBytecode.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserCallback.obj: ..\src\muParserCallback.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserCallback.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserDLL.obj: ..\src\muParserDLL.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserDLL.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserError.obj: ..\src\muParserError.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserError.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserInt.obj: ..\src\muParserInt.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserInt.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTest.obj: ..\src\muParserTest.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserTest.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTokenReader.obj: ..\src\muParserTokenReader.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserTokenReader.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParser.obj: ..\src\muParser.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParser.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBase.obj: ..\src\muParserBase.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserBase.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBytecode.obj: ..\src\muParserBytecode.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserBytecode.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserCallback.obj: ..\src\muParserCallback.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserCallback.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserDLL.obj: ..\src\muParserDLL.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserDLL.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserError.obj: ..\src\muParserError.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserError.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserInt.obj: ..\src\muParserInt.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserInt.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTest.obj: ..\src\muParserTest.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserTest.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTokenReader.obj: ..\src\muParserTokenReader.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserTokenReader.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example1_example1.obj: example1\example1.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(EXAMPLE1_CXXFLAGS) example1\example1.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example2_example2.obj: example2\example2.c
++	$(CC) /c /nologo /TC /Fo$@ $(EXAMPLE2_CFLAGS) example2\example2.c
++
+diff -ruN muparser-v2_2_3/build/makefile.vcmt muparser-v2_2_3-new/build/makefile.vcmt
+--- muparser-v2_2_3/build/makefile.vcmt	1969-12-31 17:00:00.000000000 -0700
++++ muparser-v2_2_3-new/build/makefile.vcmt	2014-11-08 06:56:42.929132800 -0700
+@@ -0,0 +1,322 @@
++# =========================================================================
++#     This makefile was generated by
++#     Bakefile 0.2.9 (http://www.bakefile.org)
++#     Do not modify, all changes will be overwritten!
++# =========================================================================
++
++
++
++# -------------------------------------------------------------------------
++# These are configurable options:
++# -------------------------------------------------------------------------
++
++# C compiler 
++CC = cl
++
++# C++ compiler 
++CXX = cl
++
++# Standard flags for CC 
++CFLAGS = 
++
++# Standard flags for C++ 
++CXXFLAGS = 
++
++# Standard preprocessor flags (common for CC and CXX) 
++CPPFLAGS = 
++
++# Standard linker flags 
++LDFLAGS = 
++
++# Set to 1 to build debug version [0,1]
++#   0 - Release
++#   1 - Debug
++DEBUG = 0
++
++# Set to 1 to build shared (DLL) version [0,1]
++#   0 - Static
++#   1 - DLL
++SHARED = 0
++
++# Set to 1 to compile samples [0,1]
++SAMPLES = 1
++
++
++
++# -------------------------------------------------------------------------
++# Do not modify the rest of this file!
++# -------------------------------------------------------------------------
++
++### Variables: ###
++
++MUPARSER_LIB_CXXFLAGS = /MT$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
++	$(____DEBUG_9) /Fdmuparser$(DEBUG_3).pdb $(____DEBUG_6) \
++	$(______DEBUG) $(____SHARED) $(____SHARED_0) /D_WIN32 /I..\include /GR /EHsc \
++	$(CPPFLAGS) $(CXXFLAGS)
++MUPARSER_LIB_OBJECTS =  \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParser.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBase.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBytecode.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserCallback.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserDLL.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserError.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserInt.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTest.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTokenReader.obj
++MUPARSER_DLL_CXXFLAGS = /MD$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
++	$(____DEBUG_9) /Fdmuparser$(DEBUG_3).pdb $(____DEBUG_6) \
++	$(______DEBUG) $(____SHARED) $(____SHARED_0) /D_WIN32 /I..\include /GR /EHsc \
++	$(CPPFLAGS) $(CXXFLAGS)
++MUPARSER_DLL_OBJECTS =  \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParser.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBase.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBytecode.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserCallback.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserDLL.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserError.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserInt.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTest.obj \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTokenReader.obj
++EXAMPLE1_CXXFLAGS = /MT$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
++	$(____DEBUG_9) /Fdexample1\example1.pdb $(____DEBUG_6) \
++	$(______DEBUG) /I..\include $(____SHARED_1) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
++EXAMPLE1_OBJECTS =  \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example1_example1.obj
++EXAMPLE2_CFLAGS = /MT$(DEBUG_3) /DWIN32 $(____DEBUG_8) $(____DEBUG) \
++	$(____DEBUG_9) /Fdexample2\example2.pdb $(____DEBUG_6) \
++	$(______DEBUG) /I..\include $(____SHARED_1) $(CPPFLAGS) $(CFLAGS)
++EXAMPLE2_OBJECTS =  \
++	obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example2_example2.obj
++
++### Conditionally set variables: ###
++
++!if "$(DEBUG)" == "0"
++DEBUGBUILDPOSTFIX = rel
++!endif
++!if "$(DEBUG)" == "1"
++DEBUGBUILDPOSTFIX = dbg
++!endif
++!if "$(SHARED)" == "0"
++SHAREDBUILDPOSTFIX = static
++!endif
++!if "$(SHARED)" == "1"
++SHAREDBUILDPOSTFIX = shared
++!endif
++!if "$(SHARED)" == "0"
++__muParser_lib___depname = muparser$(DEBUG_3).lib
++!endif
++!if "$(SHARED)" == "1"
++__muParser_dll___depname = muparser$(DEBUG_3).dll
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_23_26 = 
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_23_26 = $(____DEBUG_10)
++!endif
++!if "$(SAMPLES)" == "1" && "$(SHARED)" == "0"
++__example1___depname = example1\example1.exe
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_40_43 = 
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_40_43 = $(____DEBUG_10)
++!endif
++!if "$(SAMPLES)" == "1" && "$(SHARED)" == "1"
++__example2___depname = example2\example2.exe
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_56_59 = 
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_56_59 = $(____DEBUG_10)
++!endif
++!if "$(SHARED)" == "0"
++____SHARED = 
++!endif
++!if "$(SHARED)" == "1"
++____SHARED = /DMUPARSER_DLL
++!endif
++!if "$(SHARED)" == "0"
++____SHARED_0 = 
++!endif
++!if "$(SHARED)" == "1"
++____SHARED_0 = /DMUPARSERLIB_EXPORTS
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_8 = /DNDEBUG
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_8 = 
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG = /O2
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG = /Od
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_9 = 
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_9 = /Zi
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_5 = 
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_5 = /DEBUG
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_6 = /w
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_6 = /W4
++!endif
++!if "$(DEBUG)" == "0"
++______DEBUG = 
++!endif
++!if "$(DEBUG)" == "1"
++______DEBUG = /D_DEBUG
++!endif
++!if "$(DEBUG)" == "0"
++DEBUG_3 = 
++!endif
++!if "$(DEBUG)" == "1"
++DEBUG_3 = d
++!endif
++!if "$(DEBUG)" == "0"
++____DEBUG_10 = /opt:ref /opt:icf
++!endif
++!if "$(DEBUG)" == "1"
++____DEBUG_10 = 
++!endif
++!if "$(SHARED)" == "0"
++____SHARED_1 = 
++!endif
++!if "$(SHARED)" == "1"
++____SHARED_1 = /DUSINGDLL
++!endif
++
++
++all: obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX):
++	-if not exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX) mkdir obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)
++
++### Targets: ###
++
++all: $(__muParser_lib___depname) $(__muParser_dll___depname) $(__example1___depname) $(__example2___depname)
++
++clean: 
++	-if exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.obj del obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.obj
++	-if exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.res del obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.res
++	-if exist obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.pch del obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\*.pch
++	-if exist muparser$(DEBUG_3).lib del muparser$(DEBUG_3).lib
++	-if exist muparser$(DEBUG_3).dll del muparser$(DEBUG_3).dll
++	-if exist muparser$(DEBUG_3).ilk del muparser$(DEBUG_3).ilk
++	-if exist muparser$(DEBUG_3).pdb del muparser$(DEBUG_3).pdb
++	-if exist muparser$(DEBUG_3).lib del muparser$(DEBUG_3).lib
++	-if exist example1\example1.exe del example1\example1.exe
++	-if exist example1\example1.ilk del example1\example1.ilk
++	-if exist example1\example1.pdb del example1\example1.pdb
++	-if exist example2\example2.exe del example2\example2.exe
++	-if exist example2\example2.ilk del example2\example2.ilk
++	-if exist example2\example2.pdb del example2\example2.pdb
++
++!if "$(SHARED)" == "0"
++muparser$(DEBUG_3).lib: $(MUPARSER_LIB_OBJECTS)
++	if exist $@ del $@
++	link /LIB /NOLOGO /OUT:$@ @<<
++	$(MUPARSER_LIB_OBJECTS)
++<<
++!endif
++
++!if "$(SHARED)" == "1"
++muparser$(DEBUG_3).dll: $(MUPARSER_DLL_OBJECTS)
++	link /DLL /NOLOGO /OUT:$@  $(____DEBUG_5) /pdb:"muparser$(DEBUG_3).pdb" $(____DEBUG_23_26) $(LDFLAGS) @<<
++	$(MUPARSER_DLL_OBJECTS)   /IMPLIB:muparser$(DEBUG_3).lib
++<<
++!endif
++
++!if "$(SAMPLES)" == "1" && "$(SHARED)" == "0"
++example1\example1.exe: $(EXAMPLE1_OBJECTS) $(__muParser_lib___depname)
++	link /NOLOGO /OUT:$@  $(____DEBUG_5) /pdb:"example1\example1.pdb" $(____DEBUG_40_43) /LIBPATH:..\lib $(LDFLAGS) @<<
++	$(EXAMPLE1_OBJECTS)   muparser$(DEBUG_3).lib
++<<
++!endif
++
++!if "$(SAMPLES)" == "1" && "$(SHARED)" == "1"
++example2\example2.exe: $(EXAMPLE2_OBJECTS) $(__muParser_lib___depname)
++	link /NOLOGO /OUT:$@  $(____DEBUG_5) /pdb:"example2\example2.pdb" $(____DEBUG_56_59) /LIBPATH:..\lib $(LDFLAGS) @<<
++	$(EXAMPLE2_OBJECTS)   muparser$(DEBUG_3).lib
++<<
++!endif
++
++lib: $(__muParser_lib___depname) $(__muParser_dll___depname)
++
++samples: $(__example1___depname) $(__example2___depname)
++
++documentation: 
++	( cd ..\docs && doxygen )
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParser.obj: ..\src\muParser.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParser.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBase.obj: ..\src\muParserBase.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserBase.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserBytecode.obj: ..\src\muParserBytecode.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserBytecode.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserCallback.obj: ..\src\muParserCallback.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserCallback.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserDLL.obj: ..\src\muParserDLL.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserDLL.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserError.obj: ..\src\muParserError.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserError.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserInt.obj: ..\src\muParserInt.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserInt.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTest.obj: ..\src\muParserTest.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserTest.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_lib_muParserTokenReader.obj: ..\src\muParserTokenReader.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_LIB_CXXFLAGS) ..\src\muParserTokenReader.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParser.obj: ..\src\muParser.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParser.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBase.obj: ..\src\muParserBase.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserBase.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserBytecode.obj: ..\src\muParserBytecode.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserBytecode.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserCallback.obj: ..\src\muParserCallback.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserCallback.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserDLL.obj: ..\src\muParserDLL.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserDLL.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserError.obj: ..\src\muParserError.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserError.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserInt.obj: ..\src\muParserInt.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserInt.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTest.obj: ..\src\muParserTest.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserTest.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\muParser_dll_muParserTokenReader.obj: ..\src\muParserTokenReader.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(MUPARSER_DLL_CXXFLAGS) ..\src\muParserTokenReader.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example1_example1.obj: example1\example1.cpp
++	$(CXX) /c /nologo /TP /Fo$@ $(EXAMPLE1_CXXFLAGS) example1\example1.cpp
++
++obj\vc_$(SHAREDBUILDPOSTFIX)_$(DEBUGBUILDPOSTFIX)\example2_example2.obj: example2\example2.c
++	$(CC) /c /nologo /TC /Fo$@ $(EXAMPLE2_CFLAGS) example2\example2.c
++
+diff -ruN muparser-v2_2_3/CMakeLists.txt muparser-v2_2_3-new/CMakeLists.txt
 --- muparser-v2_2_3/CMakeLists.txt	1969-12-31 17:00:00.000000000 -0700
-+++ muparser-v2_2_3-new/CMakeLists.txt	2014-11-07 11:06:57.391957373 -0700
++++ muparser-v2_2_3-new/CMakeLists.txt	2014-11-08 06:54:43.305092500 -0700
 @@ -0,0 +1,77 @@
 +###################################################
 +#

+add_subdirectory(src)
+add_subdirectory(include)
+
diff -ruN --new-file muparser-v2_2_3/include/CMakeLists.txt muparser-v2_2_3-new/include/CMakeLists.txt
--- muparser-v2_2_3/include/CMakeLists.txt	1969-12-31 17:00:00.000000000 -0700
+++ muparser-v2_2_3-new/include/CMakeLists.txt	2014-11-07 11:07:06.639930884 -0700
@@ -0,0 +1,31 @@
+######################################################################
+#

+
+# Install headers
+install(FILES ${HEADER_FILES} DESTINATION include)
diff -ruN muparser-v2_2_3/src/CMakeLists.txt muparser-v2_2_3-new/src/CMakeLists.txt
--- muparser-v2_2_3/src/CMakeLists.txt	1969-12-31 17:00:00.000000000 -0700
+++ muparser-v2_2_3-new/src/CMakeLists.txt	2014-11-08 06:54:43.314093000 -0700
@@ -0,0 +1,35 @@
+######################################################################
+#
