mario/TDMtermite
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move pugixml to 3rdparty

Browse Source
This commit is contained in:
Mario Fink 2021-03-03 09:30:58 +01:00
parent 145392108b
commit 74c8027a10
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pugixml/pugiconfig.hpp → 3rdparty/pugixml/pugiconfig.hpp vendored
View File

0
pugixml/pugixml.cpp → 3rdparty/pugixml/pugixml.cpp vendored
View File

0
pugixml/pugixml.hpp → 3rdparty/pugixml/pugixml.hpp vendored
View File

9
makefile
View File

@ -15,8 +15,9 @@ CC = g++ -std=c++17
# compiler options and optimization flags # compiler options and optimization flags
OPT = -O3 -Wall -Werror -Wunused-variable -Wsign-compare OPT = -O3 -Wall -Werror -Wunused-variable -Wsign-compare
# include library path # include 3rd party libraries paths
LIB = pugixml/ LIBB := 3rdparty/
LIB := $(foreach dir,$(shell ls $(LIBB)),-I $(LIBB)$(dir))
# determine git version/commit tag # determine git version/commit tag
GTAG := $(shell git tag | tail -n1) GTAG := $(shell git tag | tail -n1)
@ -52,11 +53,11 @@ main.o : src/main.cpp lib/$(SRC).hpp $(HPP)
sed -i '' 's/TAGSTRING/$(GTAG)/g' $<.cpp; \ sed -i '' 's/TAGSTRING/$(GTAG)/g' $<.cpp; \
sed -i '' 's/HASHSTRING/$(GHSH)/g' $<.cpp; \ sed -i '' 's/HASHSTRING/$(GHSH)/g' $<.cpp; \
fi fi
$(CC) -c $(OPT) -I $(LIB) -I lib/ $<.cpp -o $@ $(CC) -c $(OPT) $(LIB) -I lib/ $<.cpp -o $@
@rm $<.cpp @rm $<.cpp
$(SRC).o : lib/$(SRC).cpp lib/$(SRC).hpp $(HPP) $(SRC).o : lib/$(SRC).cpp lib/$(SRC).hpp $(HPP)
$(CC) -c $(OPT) -I $(LIB) $< -o $@ $(CC) -c $(OPT) $(LIB) $< -o $@
cpp-clean : cpp-clean :
rm -f $(EXE) *.o src/main.cpp.cpp rm -f $(EXE) *.o src/main.cpp.cpp