walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #252 from matthiaskrgr/dmake_externals 

Dmake externals
This commit is contained in:
Daniel Marjamäki 2014-03-04 06:04:11 +01:00
parent a7ac1273db ebb6dc3388
commit 5eb79f0fa5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -81,15 +81,15 @@ ifndef PREFIX
endif
ifndef INCLUDE_FOR_LIB
INCLUDE_FOR_LIB=-Ilib -Iexternals -Iexternals/tinyxml
INCLUDE_FOR_LIB=-Ilib -Iexternals/tinyxml
endif
ifndef INCLUDE_FOR_CLI
INCLUDE_FOR_CLI=-Ilib -Iexternals -Iexternals/tinyxml
INCLUDE_FOR_CLI=-Ilib -Iexternals/tinyxml
endif
ifndef INCLUDE_FOR_TEST
INCLUDE_FOR_TEST=-Ilib -Icli -Iexternals -Iexternals/tinyxml
INCLUDE_FOR_TEST=-Ilib -Icli -Iexternals/tinyxml
endif
BIN=$(DESTDIR)$(PREFIX)/bin

6
tools/dmake.cpp
View File

@ -334,9 +334,9 @@ int main(int argc, char **argv)
makeConditionalVariable(fout, "CXX", "g++");
makeConditionalVariable(fout, "PREFIX", "/usr");
makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals -Iexternals/tinyxml");
makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals -Iexternals/tinyxml");
makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals -Iexternals/tinyxml");
makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";