Skip to content

Commit a87b436

Browse files
committed
Revert "Preprocessor: Start replacing our Preprocessor code with simplecpp"
This reverts commit 9820783. There was Travis errors I'll need to look more at.
1 parent 9820783 commit a87b436

7 files changed

Lines changed: 248 additions & 1939 deletions

File tree

Makefile

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ ifndef PREFIX
107107
endif
108108

109109
ifndef INCLUDE_FOR_LIB
110-
INCLUDE_FOR_LIB=-Ilib -Iexternals/simplecpp -Iexternals/tinyxml
110+
INCLUDE_FOR_LIB=-Ilib -Iexternals/tinyxml
111111
endif
112112

113113
ifndef INCLUDE_FOR_CLI
114114
INCLUDE_FOR_CLI=-Ilib -Iexternals/tinyxml
115115
endif
116116

117117
ifndef INCLUDE_FOR_TEST
118-
INCLUDE_FOR_TEST=-Ilib -Icli -Iexternals/simplecpp -Iexternals/tinyxml
118+
INCLUDE_FOR_TEST=-Ilib -Icli -Iexternals/tinyxml
119119
endif
120120

121121
BIN=$(DESTDIR)$(PREFIX)/bin
@@ -236,17 +236,11 @@ TESTOBJ = test/options.o \
236236
test/testvalueflow.o \
237237
test/testvarid.o
238238

239-
ifndef SIMPLECPP
240-
SIMPLECPP = externals/simplecpp/simplecpp.o
241-
endif
242-
243-
244239
ifndef TINYXML
245240
TINYXML = externals/tinyxml/tinyxml2.o
246241
endif
247242

248243

249-
EXTOBJ += $(SIMPLECPP)
250244
EXTOBJ += $(TINYXML)
251245
.PHONY: run-dmake
252246

@@ -620,9 +614,6 @@ test/testvalueflow.o: test/testvalueflow.cpp lib/cxx11emu.h test/testsuite.h lib
620614
test/testvarid.o: test/testvarid.cpp lib/cxx11emu.h test/testsuite.h lib/errorlogger.h lib/config.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/token.h lib/valueflow.h lib/mathlib.h lib/settings.h lib/library.h lib/standards.h lib/timer.h
621615
$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CFG) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o test/testvarid.o test/testvarid.cpp
622616

623-
externals/simplecpp/simplecpp.o: externals/simplecpp/simplecpp.cpp lib/cxx11emu.h externals/simplecpp/simplecpp.h
624-
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CFG) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o externals/simplecpp/simplecpp.o externals/simplecpp/simplecpp.cpp
625-
626617
externals/tinyxml/tinyxml2.o: externals/tinyxml/tinyxml2.cpp lib/cxx11emu.h externals/tinyxml/tinyxml2.h
627618
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CFG) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o externals/tinyxml/tinyxml2.o externals/tinyxml/tinyxml2.cpp
628619

externals/simplecpp/LICENSE

Lines changed: 0 additions & 166 deletions
This file was deleted.

0 commit comments

Comments
 (0)