From 6f9ded221d69320047a8c3a0621cd797a86c07e2 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 30 Apr 2014 08:02:42 +0200 Subject: Add support for VC12 (2013) --- examples/examples-vc12.sln | 17 +++ examples/makefile | 4 +- examples/roundtrip/makefile | 5 +- examples/template/template-vc12.vcxproj | 175 +++++++++++++++++++++++ examples/template/template-vc12.vcxproj.filters | 20 +++ libstudxml-vc12.sln | 28 ++++ makefile | 2 +- tests/makefile | 4 +- tests/parser/makefile | 5 +- tests/roundtrip/makefile | 5 +- tests/serializer/makefile | 5 +- tests/template/template-vc12.vcxproj | 171 ++++++++++++++++++++++ tests/template/template-vc12.vcxproj.filters | 20 +++ tests/tests-vc12.sln | 17 +++ xml/libstudxml-vc12.vcxproj | 179 ++++++++++++++++++++++++ xml/libstudxml-vc12.vcxproj.filters | 24 ++++ xml/makefile | 5 +- 17 files changed, 678 insertions(+), 8 deletions(-) create mode 100644 examples/examples-vc12.sln create mode 100644 examples/template/template-vc12.vcxproj create mode 100644 examples/template/template-vc12.vcxproj.filters create mode 100644 libstudxml-vc12.sln create mode 100644 tests/template/template-vc12.vcxproj create mode 100644 tests/template/template-vc12.vcxproj.filters create mode 100644 tests/tests-vc12.sln create mode 100644 xml/libstudxml-vc12.vcxproj create mode 100644 xml/libstudxml-vc12.vcxproj.filters diff --git a/examples/examples-vc12.sln b/examples/examples-vc12.sln new file mode 100644 index 0000000..446d701 --- /dev/null +++ b/examples/examples-vc12.sln @@ -0,0 +1,17 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/examples/makefile b/examples/makefile index 17bf301..339dae9 100644 --- a/examples/makefile +++ b/examples/makefile @@ -16,12 +16,13 @@ $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(examples))) $(dist): export dirs := $(examples) $(dist): export extra_dist := test.bat examples-vc9.sln examples-vc10.sln \ -examples-vc11.sln +examples-vc11.sln examples-vc12.sln $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(examples))) $(call meta-automake) $(call meta-vc9sln,examples-vc9.sln) $(call meta-vc10sln,examples-vc10.sln) $(call meta-vc11sln,examples-vc11.sln) + $(call meta-vc12sln,examples-vc12.sln) $(call meta-vctest,examples-vc9.sln,test.bat) $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(examples))) @@ -29,6 +30,7 @@ $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(examples))) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) $(call include,$(bld_root)/meta/vc11sln.make) +$(call include,$(bld_root)/meta/vc12sln.make) $(call include,$(bld_root)/meta/vctest.make) $(call include,$(bld_root)/meta/automake.make) diff --git a/examples/roundtrip/makefile b/examples/roundtrip/makefile index feeddcd..2644eb3 100644 --- a/examples/roundtrip/makefile +++ b/examples/roundtrip/makefile @@ -35,13 +35,15 @@ $(dist): sources := $(cxx_tun) $(dist): extras := README position.xml $(dist): export extra_dist := $(extras) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters +$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ +$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters $(dist): $(call dist-data,$(sources) $(extras)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) + $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) # Test. # @@ -74,6 +76,7 @@ $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) $(call include,$(bld_root)/meta/vc11proj.make) +$(call include,$(bld_root)/meta/vc12proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/o-e.make) diff --git a/examples/template/template-vc12.vcxproj b/examples/template/template-vc12.vcxproj new file mode 100644 index 0000000..6e7c2c9 --- /dev/null +++ b/examples/template/template-vc12.vcxproj @@ -0,0 +1,175 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v120 + Unicode + + + Application + true + v120 + Unicode + + + Application + false + v120 + true + Unicode + + + Application + false + v120 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(Configuration)\ + driver + + + true + $(Platform)\$(Configuration)\ + driver + + + false + $(Configuration)\ + driver + + + false + $(Platform)\$(Configuration)\ + driver + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(SolutionDir)\.. + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + $(SolutionDir)\..\lib\studxml-d.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(SolutionDir)\.. + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + $(SolutionDir)\..\lib64\studxml-d.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(SolutionDir)\.. + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + $(SolutionDir)\..\lib\studxml.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(SolutionDir)\.. + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + $(SolutionDir)\..\lib64\studxml.lib;%(AdditionalDependencies) + Console + true + true + true + + + +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__source_entries__(extra_sources) + + + + + diff --git a/examples/template/template-vc12.vcxproj.filters b/examples/template/template-vc12.vcxproj.filters new file mode 100644 index 0000000..6d459fa --- /dev/null +++ b/examples/template/template-vc12.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__source_filter_entries__(extra_sources) + + diff --git a/libstudxml-vc12.sln b/libstudxml-vc12.sln new file mode 100644 index 0000000..df9496e --- /dev/null +++ b/libstudxml-vc12.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstudxml", "xml\libstudxml-vc12.vcxproj", "{26482FB9-45CC-4188-8CA1-B86456967F47}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {26482FB9-45CC-4188-8CA1-B86456967F47}.Debug|Win32.ActiveCfg = Debug|Win32 + {26482FB9-45CC-4188-8CA1-B86456967F47}.Debug|Win32.Build.0 = Debug|Win32 + {26482FB9-45CC-4188-8CA1-B86456967F47}.Debug|x64.ActiveCfg = Debug|x64 + {26482FB9-45CC-4188-8CA1-B86456967F47}.Debug|x64.Build.0 = Debug|x64 + {26482FB9-45CC-4188-8CA1-B86456967F47}.Release|Win32.ActiveCfg = Release|Win32 + {26482FB9-45CC-4188-8CA1-B86456967F47}.Release|Win32.Build.0 = Release|Win32 + {26482FB9-45CC-4188-8CA1-B86456967F47}.Release|x64.ActiveCfg = Release|x64 + {26482FB9-45CC-4188-8CA1-B86456967F47}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/makefile b/makefile index 4e321a3..73cddaf 100644 --- a/makefile +++ b/makefile @@ -17,7 +17,7 @@ $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(dirs))) $(dist): export dirs := $(dirs) $(dist): export docs := LICENSE NEWS README INSTALL version tester.bat $(dist): data_dist := libstudxml-vc9.sln libstudxml-vc10.sln \ -libstudxml-vc11.sln +libstudxml-vc11.sln libstudxml-vc12.sln $(dist): exec_dist := bootstrap tester.in $(dist): export extra_dist := $(data_dist) $(exec_dist) $(dist): export version = $(shell cat $(src_root)/version) diff --git a/tests/makefile b/tests/makefile index d058583..db15287 100644 --- a/tests/makefile +++ b/tests/makefile @@ -16,12 +16,13 @@ $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) $(dist): export dirs := $(tests) $(dist): export extra_dist := test.bat tests-vc9.sln tests-vc10.sln \ -tests-vc11.sln +tests-vc11.sln tests-vc12.sln $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) $(call meta-automake) $(call meta-vc9sln,tests-vc9.sln) $(call meta-vc10sln,tests-vc10.sln) $(call meta-vc11sln,tests-vc11.sln) + $(call meta-vc12sln,tests-vc12.sln) $(call meta-vctest,tests-vc9.sln,test.bat) $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) @@ -29,6 +30,7 @@ $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) $(call include,$(bld_root)/meta/vc11sln.make) +$(call include,$(bld_root)/meta/vc12sln.make) $(call include,$(bld_root)/meta/vctest.make) $(call include,$(bld_root)/meta/automake.make) diff --git a/tests/parser/makefile b/tests/parser/makefile index 1529317..1336e3f 100644 --- a/tests/parser/makefile +++ b/tests/parser/makefile @@ -34,13 +34,15 @@ $(dist): name := $(subst $(src_root)/tests/,,$(src_base)) $(dist): sources := $(cxx_tun) $(dist): export extra_dist := $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters +$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ +$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters $(dist): $(call dist-data,$(sources)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) + $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) # Test. @@ -75,6 +77,7 @@ $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) $(call include,$(bld_root)/meta/vc11proj.make) +$(call include,$(bld_root)/meta/vc12proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/o-e.make) diff --git a/tests/roundtrip/makefile b/tests/roundtrip/makefile index d550036..672951c 100644 --- a/tests/roundtrip/makefile +++ b/tests/roundtrip/makefile @@ -45,13 +45,15 @@ $(dist): sources := $(cxx_tun) $(dist): extras := $(tests) $(dist): export extra_dist := $(extras) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters +$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ +$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters $(dist): $(call dist-data,$(sources) $(extras)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) + $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) # Test. # @@ -88,6 +90,7 @@ $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) $(call include,$(bld_root)/meta/vc11proj.make) +$(call include,$(bld_root)/meta/vc12proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/o-e.make) diff --git a/tests/serializer/makefile b/tests/serializer/makefile index fb5ca5a..da37254 100644 --- a/tests/serializer/makefile +++ b/tests/serializer/makefile @@ -36,13 +36,15 @@ $(dist): name := $(subst $(src_root)/tests/,,$(src_base)) $(dist): sources := $(cxx_tun) $(dist): export extra_dist := $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters +$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ +$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters $(dist): $(call dist-data,$(sources)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) + $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) # Test. @@ -77,6 +79,7 @@ $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) $(call include,$(bld_root)/meta/vc11proj.make) +$(call include,$(bld_root)/meta/vc12proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/o-e.make) diff --git a/tests/template/template-vc12.vcxproj b/tests/template/template-vc12.vcxproj new file mode 100644 index 0000000..411c7e0 --- /dev/null +++ b/tests/template/template-vc12.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v120 + Unicode + + + Application + true + v120 + Unicode + + + Application + false + v120 + true + Unicode + + + Application + false + v120 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(Configuration)\ + driver + + + true + $(Platform)\$(Configuration)\ + driver + + + false + $(Configuration)\ + driver + + + false + $(Platform)\$(Configuration)\ + driver + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(SolutionDir)\.. + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\lib\studxml-d.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(SolutionDir)\.. + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\lib64\studxml-d.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(SolutionDir)\.. + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\lib\studxml.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(SolutionDir)\.. + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\lib64\studxml.lib;%(AdditionalDependencies) + Console + true + true + true + + + +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__source_entries__(extra_sources) + + + + + diff --git a/tests/template/template-vc12.vcxproj.filters b/tests/template/template-vc12.vcxproj.filters new file mode 100644 index 0000000..6d459fa --- /dev/null +++ b/tests/template/template-vc12.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__source_filter_entries__(extra_sources) + + diff --git a/tests/tests-vc12.sln b/tests/tests-vc12.sln new file mode 100644 index 0000000..446d701 --- /dev/null +++ b/tests/tests-vc12.sln @@ -0,0 +1,17 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/xml/libstudxml-vc12.vcxproj b/xml/libstudxml-vc12.vcxproj new file mode 100644 index 0000000..664bb19 --- /dev/null +++ b/xml/libstudxml-vc12.vcxproj @@ -0,0 +1,179 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {26482FB9-45CC-4188-8CA1-B86456967F47} + Win32Proj + libstudxml + + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\bin\ + studxml-d-__value__(interface_version)-vc12 + + + true + ..\bin64\ + studxml-d-__value__(interface_version)-vc12 + + + false + ..\bin\ + studxml-__value__(interface_version)-vc12 + + + false + ..\bin64\ + studxml-__value__(interface_version)-vc12 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + + + Windows + true + $(TargetPath) + ..\lib\studxml-d.lib + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + + + Windows + true + $(TargetPath) + ..\lib64\studxml-d.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + + + Windows + true + true + true + $(TargetPath) + ..\lib\studxml.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + + + Windows + true + true + true + $(TargetPath) + ..\lib64\studxml.lib + + + +__header_entries__(headers) +__header_entries__(expat_headers) +__header_entries__(genx_headers) +__header_entry__(details\config-vc.h) + + +__source_entries__(sources) +__source_entries__(expat_sources) +__source_entries__(genx_sources) + + + + + diff --git a/xml/libstudxml-vc12.vcxproj.filters b/xml/libstudxml-vc12.vcxproj.filters new file mode 100644 index 0000000..b6093d3 --- /dev/null +++ b/xml/libstudxml-vc12.vcxproj.filters @@ -0,0 +1,24 @@ + + + + + {B3C787E6-B23A-41BB-BF39-DFD42DEE8FDA} + c;cxx + + + {90BC2EB8-E1F4-4ADA-AD98-FB8727184CAA} + h;hxx;ixx;txx + + + +__header_filter_entries__(headers) +__header_filter_entries__(expat_headers) +__header_filter_entries__(genx_headers) +__header_filter_entry__(details\config-vc.h) + + +__source_filter_entries__(sources) +__source_filter_entries__(expat_sources) +__source_filter_entries__(genx_sources) + + diff --git a/xml/makefile b/xml/makefile index a64f85b..6c8f3b9 100644 --- a/xml/makefile +++ b/xml/makefile @@ -82,7 +82,8 @@ $(dist): export headers := $(subst $(src_base)/,,$(shell find $(src_base) \ $(dist): data_dist := details/config-vc.h $(expat_dist) $(genx_dist) $(dist): export extra_dist := $(data_dist) libstudxml-vc9.vcproj \ libstudxml-vc10.vcxproj libstudxml-vc10.vcxproj.filters \ -libstudxml-vc11.vcxproj libstudxml-vc11.vcxproj.filters +libstudxml-vc11.vcxproj libstudxml-vc11.vcxproj.filters \ +libstudxml-vc12.vcxproj libstudxml-vc12.vcxproj.filters $(dist): export interface_version = $(shell sed -e \ 's/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) @@ -93,6 +94,7 @@ $(dist): $(call meta-vc9proj,libstudxml-vc9.vcproj) $(call meta-vc10proj,libstudxml-vc10.vcxproj) $(call meta-vc10proj,libstudxml-vc11.vcxproj) + $(call meta-vc12proj,libstudxml-vc12.vcxproj) $(call meta-automake) # Clean. @@ -123,6 +125,7 @@ $(call include,$(bld_root)/install.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) $(call include,$(bld_root)/meta/vc11proj.make) +$(call include,$(bld_root)/meta/vc12proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/c/c-o.make) -- cgit v1.1