From: <mth...@us...> - 2009-01-26 02:31:20
|
Revision: 8511 http://openmsx.svn.sourceforge.net/openmsx/?rev=8511&view=rev Author: mthuurne Date: 2009-01-26 01:39:35 +0000 (Mon, 26 Jan 2009) Log Message: ----------- Moved BUILD_COMPONENTS from build-info.hh to components.hh. This removes the need for info2code.mk to access COMPONENTS_TRUE, which simplifies conversion to Python. Modified Paths: -------------- openmsx/trunk/build/components.mk openmsx/trunk/build/info2code.mk openmsx/trunk/src/CommandLineParser.cc Modified: openmsx/trunk/build/components.mk =================================================================== --- openmsx/trunk/build/components.mk 2009-01-26 01:06:24 UTC (rev 8510) +++ openmsx/trunk/build/components.mk 2009-01-26 01:39:35 UTC (rev 8511) @@ -56,6 +56,12 @@ @echo "Creating $@..." @mkdir -p $(@D) @echo "// Automatically generated by build process." > $@ + @echo "" >> $@ + @echo "#ifndef COMPONENTS_HH" >> $@ + @echo "#define COMPONENTS_HH" >> $@ + @echo "" >> $@ + @echo "#include <string>" >> $@ + @echo "" >> $@ @if [ -n "$(COMPONENTS_TRUE)" ]; then \ comps="$(COMPONENTS_TRUE)"; \ for comp in $$comps; do \ @@ -66,4 +72,11 @@ for comp in $$comps; do \ echo "// #undef COMPONENT_$$comp"; \ done; fi >> $@ - + @echo "" >> $@ + @echo "namespace openmsx {" >> $@ + @echo "" >> $@ + @echo "static const std::string BUILD_COMPONENTS = \"$(sort $(COMPONENTS_TRUE))\";" >> $@ + @echo "" >> $@ + @echo "} // namespace openmsx" >> $@ + @echo "" >> $@ + @echo "#endif // COMPONENTS_HH" >> $@ Modified: openmsx/trunk/build/info2code.mk =================================================================== --- openmsx/trunk/build/info2code.mk 2009-01-26 01:06:24 UTC (rev 8510) +++ openmsx/trunk/build/info2code.mk 2009-01-26 01:39:35 UTC (rev 8511) @@ -46,7 +46,6 @@ @echo "static const bool OPENMSX_SET_WINDOW_ICON = $(SET_WINDOW_ICON);" >> $@ @echo "static const std::string DATADIR = \"$(INSTALL_SHARE_DIR)\";" >> $@ @echo "static const std::string BUILD_FLAVOUR = \"$(OPENMSX_FLAVOUR)\";" >> $@ - @echo "static const std::string BUILD_COMPONENTS = \"$(sort $(COMPONENTS_TRUE))\";" >> $@ @echo "" >> $@ @echo "} // namespace openmsx" >> $@ @echo "" >> $@ Modified: openmsx/trunk/src/CommandLineParser.cc =================================================================== --- openmsx/trunk/src/CommandLineParser.cc 2009-01-26 01:06:24 UTC (rev 8510) +++ openmsx/trunk/src/CommandLineParser.cc 2009-01-26 01:39:35 UTC (rev 8511) @@ -25,6 +25,8 @@ #include "HostCPU.hh" #include "GLUtil.hh" #include "Reactor.hh" +#include "build-info.hh" +#include "components.hh" #include <cassert> #include <iostream> #include <cstdio> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |