[libcroco] Visual Studio builds: Move projects to win32/
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libcroco] Visual Studio builds: Move projects to win32/
- Date: Thu, 23 Feb 2017 02:59:23 +0000 (UTC)
commit 2fc527d65acb2cc27c5522e70290c6648ff13cae
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Feb 23 10:57:29 2017 +0800
Visual Studio builds: Move projects to win32/
This enables us to go one less layer down the tree to reach the projects and
allows the autotools modules Makefile-newvs.am and Makefile.msvcproj be in
sync with the latest ones in GLib master.
Makefile.am | 2 +-
build/Makefile-newvs.am | 53 -------
build/Makefile.am | 21 ---
build/Makefile.msvcproj | 114 ---------------
configure.ac | 19 ++--
src/Makefile.am | 6 +-
win32/Makefile-newvs.am | 55 +++++++
{build/win32 => win32}/Makefile.am | 0
win32/Makefile.msvcproj | 153 ++++++++++++++++++++
{build/win32 => win32}/vs10/Makefile.am | 12 +-
.../win32 => win32}/vs10/croco-build-defines.props | 2 +-
{build/win32 => win32}/vs10/croco-gen-srcs.props | 4 +-
{build/win32 => win32}/vs10/croco-install.propsin | 0
{build/win32 => win32}/vs10/croco-install.vcxproj | 28 ++---
.../vs10/croco-version-paths.props.in | 2 +-
.../win32 => win32}/vs10/croco.vcxproj.filtersin | 4 +-
{build/win32 => win32}/vs10/croco.vcxprojin | 46 ++----
{build/win32 => win32}/vs10/csslint.vcxproj | 10 +-
.../win32 => win32}/vs10/csslint.vcxproj.filters | 4 +-
{build/win32 => win32}/vs10/libcroco.sln | 0
{build/win32 => win32}/vs11/Makefile.am | 5 +-
{build/win32 => win32}/vs12/Makefile.am | 5 +-
{build/win32 => win32}/vs14/Makefile.am | 5 +-
{build/win32 => win32}/vs15/Makefile.am | 5 +-
{build/win32 => win32}/vs9/Makefile.am | 4 +-
.../vs9/croco-build-defines.vsprops | 2 +-
{build/win32 => win32}/vs9/croco-gen-srcs.vsprops | 4 +-
{build/win32 => win32}/vs9/croco-install.vcproj | 0
{build/win32 => win32}/vs9/croco-install.vspropsin | 0
.../vs9/croco-version-paths.vsprops.in | 2 +-
{build/win32 => win32}/vs9/croco.vcprojin | 12 +-
{build/win32 => win32}/vs9/csslint.vcproj | 2 +-
{build/win32 => win32}/vs9/libcroco.sln | 0
33 files changed, 290 insertions(+), 291 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3dc6cec..4b482f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-SUBDIRS = src csslint docs tests build
+SUBDIRS = src csslint docs tests win32
PKG_CONFIG_FILE_UNINSTALLED=libcroco-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION -uninstalled pc
PKG_CONFIG_FILE=libcroco-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@.pc
diff --git a/configure.ac b/configure.ac
index eaf5171..6f28a5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,16 +153,15 @@ libcroco.spec
libcroco-zip
croco-config
config.h.win32
-build/Makefile
-build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs9/croco-version-paths.vsprops
-build/win32/vs10/Makefile
-build/win32/vs10/croco-version-paths.props
-build/win32/vs11/Makefile
-build/win32/vs12/Makefile
-build/win32/vs14/Makefile
-build/win32/vs15/Makefile
+win32/Makefile
+win32/vs9/Makefile
+win32/vs9/croco-version-paths.vsprops
+win32/vs10/Makefile
+win32/vs10/croco-version-paths.props
+win32/vs11/Makefile
+win32/vs12/Makefile
+win32/vs14/Makefile
+win32/vs15/Makefile
docs/Makefile
docs/examples/Makefile
docs/reference/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 0eaaa14..6e1f332 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -126,8 +126,8 @@ croco_HEADERS_DIR = $(crocoincdir)
croco_HEADERS_INST = $(crocoinc_HEADERS)
croco_HEADERS_EXCLUDES = dummy
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
dist-hook: \
- $(top_builddir)/build/win32/vs9/croco.vcproj \
- $(top_builddir)/build/win32/vs9/croco.headers
+ $(top_builddir)/win32/vs9/croco.vcproj \
+ $(top_builddir)/win32/vs9/croco.headers
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
new file mode 100644
index 0000000..3a91862
--- /dev/null
+++ b/win32/Makefile-newvs.am
@@ -0,0 +1,55 @@
+# Centralized autotools file
+# Create the Visual Studio 2012/2013/2015 project files
+# from the Visual Studio 2010 project files
+
+# This autotools file, from GLib, can be used in other projects
+# that have Visual Studio build support.
+
+# Author: Fan, Chun-wei
+# November 05, 2012
+
+# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013)
+# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15)
+# MSVC_BASE_TOOLSET: Use if baseline MSVC toolset is not in the form v$(MSVC_BASE_VER)0, meaning
v$(MSVC_BASE_TOOLSET)
+# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
+# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
+
+if MSVC_BASE_NO_TOOLSET_SET
+MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
+endif
+
+if MSVC_NO_TOOLSET_SET
+MSVC_TOOLSET = $(MSVC_VER)0
+endif
+
+%.sln:
+ sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ >
$(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+ sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp >
$(top_builddir)/win32/vs$(MSVC_VER)/$@
+ rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+
+%.txt:
+ sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ >
$(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+ sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp >
$(top_builddir)/win32/vs$(MSVC_VER)/$@
+ rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+
+%.vcxproj:
+ if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
+ sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@
$(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ else \
+ sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' <
$(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ fi
+
+%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile
+ if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
+ sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' <
$(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ else \
+ sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' <
$(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ fi
+
+%.vcxproj.filters:
+ if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
+ cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ else \
+ cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ fi
diff --git a/build/win32/Makefile.am b/win32/Makefile.am
similarity index 100%
rename from build/win32/Makefile.am
rename to win32/Makefile.am
diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj
new file mode 100644
index 0000000..2e96e12
--- /dev/null
+++ b/win32/Makefile.msvcproj
@@ -0,0 +1,153 @@
+# Author: Fan, Chun-wei
+# Common Autotools file used to generate Visual Studio 2008+
+# Projects from their templates
+
+# This autotools file, from GLib, can be used in other projects
+# that have Visual Studio build support.
+
+# * Input variables:
+#
+# MSVCPROJS - List of Projects that should be generated
+#
+# * Simple tutorial
+#
+# Add this to Makefile.am where your library/program is built:
+# include <this Makefile.msvcproj>
+# MSVCPROJS = YourProject (can be multiple projects in a single srcdir)
+# YourProject_FILES = $(libyourlib_1_0_SOURCES)
+# YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random
unsed value if none
+# (the following 3 lines if headers need to be installed)
+# YourProject_HEADERS_DIR = $(libyourlibincludedir)
+# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS)
+# YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|',
wildcards allowed; use random unsed value if none>
+#
+# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in
the process)
+# $(top_builddir)/win32/vs9/YourProject.vcproj \
+# $(top_builddir)/win32/vs9/YourProject.headers # if headers need to be installed
+#
+# --or, if Visual Studio 2013 or later is required--
+# dist-hook: \ # (or add to it if it is already there, this does -not- call other vs items in the process)
+# $(top_builddir)/win32/vs12/YourProject.vcxproj \
+# $(top_builddir)/win32/vs12/YourProject.vs12.headers # if headers need to be installed
+
+# Private functions
+
+## Transform the MSVC project filename (no filename extensions) to something which can reference through a
variable
+## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0
+_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1))))
+_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir))
+_proj_path=$(subst /,\\,$(_proj_path_raw))
+_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\)
+_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int))
+
+_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES))
+_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst
$(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw))))
+_proj_filters=$($(_proj_name)_EXCLUDES)
+
+_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST))
+_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst
$(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw))))
+_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES)
+
+_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR))
+_headers_destdir=$(subst /,\\,$(_headers_dest_posix))
+
+#
+# Creates Visual Studio 2008/2010 projects from items passed in from autotools files
+# $(1) - Base Name of the MSVC project files (outputs)
+#
+
+define msvcproj-builder
+
+$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj
+$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj
+$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
+$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
+$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj
+
+$(top_builddir)/win32/vs9/$(1).vcproj: Makefile
+ -$(RM) $(top_builddir)/win32/vs9/$(1).vcproj
+ -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj
+ -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters
+ -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj
+ -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters
+ -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj
+ -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters
+ -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
+ -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
+
+
+ for F in $(_proj_files); do \
+ case $$$$F in \
+ $(_proj_filters)) \
+ ;; \
+ *.c|*.cpp|*.cc|*.cxx) \
+ echo ' <File RelativePath="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles
&& \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source
Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \
+ ;; \
+ esac; \
+ done
+
+
+ $(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj
+ $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj
+ $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin
$(top_builddir)/win32/vs10/$(1).vcxproj.filters
+ $(RM) $(1).sourcefiles
+ $(RM) $(1).vs10.sourcefiles
+ $(RM) $(1).vs10.sourcefiles.filters
+
+$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers
+
+$(top_builddir)/win32/vs9/$(1).headers: Makefile
+ -$(RM) $(top_builddir)/win32/vs9/$(1).headers
+ -$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers
+
+ for F in $(_proj_headers); do \
+ case $$$$F in \
+ $(_proj_headers_excludes)) \
+ ;; \
+ *.h|*.hpp|*.hh|*.hxx) \
+ echo 'copy ..\..'$(_proj_subdir)$$$$F'
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'
' >>$(top_builddir)/win32/vs9/$(1).headers && \
+ echo 'copy ..\..'$(_proj_subdir)$$$$F'
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \
+ ;; \
+ esac; \
+ done
+
+$(top_builddir)/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/win32/vs12/$(1).vcxproj
+
+$(top_builddir)/win32/vs12/$(1).vcxproj: Makefile
+ -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
+ -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
+
+ for F in $(_proj_files); do \
+ case $$$$F in \
+ $(_proj_filters)) \
+ ;; \
+ *.c|*.cpp|*.cc|*.cxx) \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs12.sourcefiles
&& \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source
Files</Filter></ClCompile>' >>$(1).vs12.sourcefiles.filters \
+ ;; \
+ esac; \
+ done
+
+ $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxprojin >$(top_builddir)/win32/vs12/$(1).vcxproj
+ $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxproj.filtersin
$(top_builddir)/win32/vs12/$(1).vcxproj.filters
+ $(RM) $(1).vs12.sourcefiles
+ $(RM) $(1).vs12.sourcefiles.filters
+
+$(top_builddir)/win32/vs12/$(1).vs12.headers: Makefile
+ -$(RM) $(top_builddir)/win32/vs12/$(1).vs12.headers
+
+ for F in $(_proj_headers); do \
+ case $$$$F in \
+ $(_proj_headers_excludes)) \
+ ;; \
+ *.h|*.hpp|*.hh|*.hxx) \
+ echo 'copy ..\..'$(_proj_subdir)$$$$F'
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs12/$(1).vs12.headers \
+ ;; \
+ esac; \
+ done
+
+endef
+
+$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj))))
diff --git a/build/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
similarity index 74%
rename from build/win32/vs10/Makefile.am
rename to win32/vs10/Makefile.am
index 97c885a..f89cbea 100644
--- a/build/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -35,12 +35,12 @@ EXTRA_DIST = \
croco-version-paths.props.in \
$(GENERATED_ITEMS)
-croco-install.props: $(top_srcdir)/build/win32/vs10/croco-install.propsin croco.vs10.headers
- -$(RM) $(top_builddir)/build/win32/vs11/croco-install.props
- -$(RM) $(top_builddir)/build/win32/vs12/croco-install.props
- -$(RM) $(top_builddir)/build/win32/vs14/croco-install.props
- -$(RM) $(top_builddir)/build/win32/vs15/croco-install.props
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/croco-install.propsin > $@
+croco-install.props: $(top_srcdir)/win32/vs10/croco-install.propsin croco.vs10.headers
+ -$(RM) $(top_builddir)/win32/vs11/croco-install.props
+ -$(RM) $(top_builddir)/win32/vs12/croco-install.props
+ -$(RM) $(top_builddir)/win32/vs14/croco-install.props
+ -$(RM) $(top_builddir)/win32/vs15/croco-install.props
+ $(CPP) -P - <$(top_srcdir)/win32/vs10/croco-install.propsin > $@
rm croco.vs10.headers
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs10/croco-build-defines.props b/win32/vs10/croco-build-defines.props
similarity index 87%
rename from build/win32/vs10/croco-build-defines.props
rename to win32/vs10/croco-build-defines.props
index 21aa3ff..064658c 100644
--- a/build/win32/vs10/croco-build-defines.props
+++ b/win32/vs10/croco-build-defines.props
@@ -29,7 +29,7 @@ See COPYRIGHTS file for copyright information.
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\src;..\..\..;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\src;..\..;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/build/win32/vs10/croco-gen-srcs.props b/win32/vs10/croco-gen-srcs.props
similarity index 91%
rename from build/win32/vs10/croco-gen-srcs.props
rename to win32/vs10/croco-gen-srcs.props
index a584aa9..83f7d30 100644
--- a/build/win32/vs10/croco-gen-srcs.props
+++ b/win32/vs10/croco-gen-srcs.props
@@ -23,11 +23,11 @@ See COPYRIGHTS file for copyright information.
<Import Project="croco-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+ <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH>
<GenerateLibCrocoDef>
echo EXPORTS > $(DefDir)libcroco.def
-cl /EP ..\..\..\src\libcroco.symbols >> $(DefDir)libcroco.def
+cl /EP ..\..\src\libcroco.symbols >> $(DefDir)libcroco.def
</GenerateLibCrocoDef>
</PropertyGroup>
<PropertyGroup>
diff --git a/build/win32/vs10/croco-install.propsin b/win32/vs10/croco-install.propsin
similarity index 100%
rename from build/win32/vs10/croco-install.propsin
rename to win32/vs10/croco-install.propsin
diff --git a/build/win32/vs10/croco-install.vcxproj b/win32/vs10/croco-install.vcxproj
similarity index 74%
rename from build/win32/vs10/croco-install.vcxproj
rename to win32/vs10/croco-install.vcxproj
index 6e702bc..a40ad4b 100644
--- a/build/win32/vs10/croco-install.vcxproj
+++ b/win32/vs10/croco-install.vcxproj
@@ -85,11 +85,9 @@ See COPYRIGHTS file for copyright information.
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
+ <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
+ <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -101,19 +99,13 @@ See COPYRIGHTS file for copyright information.
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</ItemDefinitionGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build
Results...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibCrocoDoInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledWin32Bins);%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LibCrocoDoInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledX64Bins);%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build
Results...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibCrocoDoInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledWin32Bins);%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build
Results...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibCrocoDoInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledX64Bins);%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\config.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(LibCrocoDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug">blah;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(LibCrocoDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
@@ -129,4 +121,4 @@ See COPYRIGHTS file for copyright information.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/croco-version-paths.props.in b/win32/vs10/croco-version-paths.props.in
similarity index 96%
rename from build/win32/vs10/croco-version-paths.props.in
rename to win32/vs10/croco-version-paths.props.in
index f68ae2a..10bbb2b 100644
--- a/build/win32/vs10/croco-version-paths.props.in
+++ b/win32/vs10/croco-version-paths.props.in
@@ -22,7 +22,7 @@ See COPYRIGHTS file for copyright information.
<PropertyGroup Label="UserMacros">
<ApiVersion>@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@</ApiVersion>
<VSVer>10</VSVer>
- <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
<LibCrocoLibtoolCompatibleDllPrefix>lib</LibCrocoLibtoolCompatibleDllPrefix>
diff --git a/build/win32/vs10/croco.vcxproj.filtersin b/win32/vs10/croco.vcxproj.filtersin
similarity index 89%
rename from build/win32/vs10/croco.vcxproj.filtersin
rename to win32/vs10/croco.vcxproj.filtersin
index 937c204..4cce25f 100644
--- a/build/win32/vs10/croco.vcxproj.filtersin
+++ b/win32/vs10/croco.vcxproj.filtersin
@@ -37,7 +37,7 @@ See COPYRIGHTS file for copyright information.
#include "croco.vs10.sourcefiles.filters"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
- <CustomBuild Include="..\..\..\src\libcroco.symbols"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\src\libcroco.symbols"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/croco.vcxprojin b/win32/vs10/croco.vcxprojin
similarity index 76%
rename from build/win32/vs10/croco.vcxprojin
rename to win32/vs10/croco.vcxprojin
index 580a455..e81481b 100644
--- a/build/win32/vs10/croco.vcxprojin
+++ b/win32/vs10/croco.vcxprojin
@@ -86,10 +86,8 @@ See COPYRIGHTS file for copyright information.
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -201,33 +199,21 @@ See COPYRIGHTS file for copyright information.
#include "croco.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyConfigH)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\config.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\..\..\src\libcroco.symbols">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating libcroco.def...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateLibCrocoDef)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\libcroco.def;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating libcroco.def...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateLibCrocoDef)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\libcroco.def;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating
libcroco.def...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateLibCrocoDef)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\libcroco.def;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating libcroco.def...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateLibCrocoDef)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\libcroco.def;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\src\libcroco.symbols">
+ <Message Condition="'$(Configuration)'=='Debug'">Generating libcroco.def...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenerateLibCrocoDef)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">$(IntDir)\libcroco.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Generating libcroco.def...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenerateLibCrocoDef)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">$(IntDir)\libcroco.def;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/build/win32/vs10/csslint.vcxproj b/win32/vs10/csslint.vcxproj
similarity index 95%
rename from build/win32/vs10/csslint.vcxproj
rename to win32/vs10/csslint.vcxproj
index 5917b79..452aa4a 100644
--- a/build/win32/vs10/csslint.vcxproj
+++ b/win32/vs10/csslint.vcxproj
@@ -86,10 +86,8 @@ See COPYRIGHTS file for copyright information.
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -182,7 +180,7 @@ See COPYRIGHTS file for copyright information.
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\csslint\csslint.c" />
+ <ClCompile Include="..\..\csslint\csslint.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="croco.vcxproj">
@@ -193,4 +191,4 @@ See COPYRIGHTS file for copyright information.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/csslint.vcxproj.filters b/win32/vs10/csslint.vcxproj.filters
similarity index 94%
rename from build/win32/vs10/csslint.vcxproj.filters
rename to win32/vs10/csslint.vcxproj.filters
index ced8ee4..1145315 100644
--- a/build/win32/vs10/csslint.vcxproj.filters
+++ b/win32/vs10/csslint.vcxproj.filters
@@ -26,8 +26,8 @@ See COPYRIGHTS file for copyright information.
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\csslint\csslint.c">
+ <ClCompile Include="..\..\csslint\csslint.c">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/libcroco.sln b/win32/vs10/libcroco.sln
similarity index 100%
rename from build/win32/vs10/libcroco.sln
rename to win32/vs10/libcroco.sln
diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
similarity index 92%
rename from build/win32/vs11/Makefile.am
rename to win32/vs11/Makefile.am
index 1585d00..7c713f2 100644
--- a/build/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -30,8 +30,9 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST)
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
MSVC_VER = 11
-MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 2012
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
similarity index 92%
rename from build/win32/vs12/Makefile.am
rename to win32/vs12/Makefile.am
index fec229e..7687c14 100644
--- a/build/win32/vs12/Makefile.am
+++ b/win32/vs12/Makefile.am
@@ -30,8 +30,9 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST)
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
MSVC_VER = 12
-MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 2013
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
similarity index 92%
rename from build/win32/vs14/Makefile.am
rename to win32/vs14/Makefile.am
index bc1d319..b1e7ee9 100644
--- a/build/win32/vs14/Makefile.am
+++ b/win32/vs14/Makefile.am
@@ -30,8 +30,9 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST)
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
MSVC_VER = 14
-MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 14
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
similarity index 92%
rename from build/win32/vs15/Makefile.am
rename to win32/vs15/Makefile.am
index e738572..9f2e096 100644
--- a/build/win32/vs15/Makefile.am
+++ b/win32/vs15/Makefile.am
@@ -30,9 +30,10 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST)
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
MSVC_VER = 15
-MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 15
MSVC_TOOLSET = 141
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
similarity index 87%
rename from build/win32/vs9/Makefile.am
rename to win32/vs9/Makefile.am
index 9de2db8..9128036 100644
--- a/build/win32/vs9/Makefile.am
+++ b/win32/vs9/Makefile.am
@@ -32,8 +32,8 @@ EXTRA_DIST = \
croco-version-paths.vsprops.in \
$(GENERATED_ITEMS)
-croco-install.vsprops: $(top_srcdir)/build/win32/vs9/croco-install.vspropsin croco.headers
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/croco-install.vspropsin >$@
+croco-install.vsprops: $(top_srcdir)/win32/vs9/croco-install.vspropsin croco.headers
+ $(CPP) -P - <$(top_srcdir)/win32/vs9/croco-install.vspropsin >$@
rm croco.headers
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs9/croco-build-defines.vsprops b/win32/vs9/croco-build-defines.vsprops
similarity index 87%
rename from build/win32/vs9/croco-build-defines.vsprops
rename to win32/vs9/croco-build-defines.vsprops
index f39c12a..a081b7b 100644
--- a/build/win32/vs9/croco-build-defines.vsprops
+++ b/win32/vs9/croco-build-defines.vsprops
@@ -28,7 +28,7 @@ See COPYRIGHTS file for copyright information.
>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..\src;..\..\..;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include"
+
AdditionalIncludeDirectories="..\..\src;..\..;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include"
PreprocessorDefinitions="HAVE_CONFIG_H"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
AdditionalOptions="/MP"
diff --git a/build/win32/vs9/croco-gen-srcs.vsprops b/win32/vs9/croco-gen-srcs.vsprops
similarity index 89%
rename from build/win32/vs9/croco-gen-srcs.vsprops
rename to win32/vs9/croco-gen-srcs.vsprops
index e3562e3..5be8fe7 100644
--- a/build/win32/vs9/croco-gen-srcs.vsprops
+++ b/win32/vs9/croco-gen-srcs.vsprops
@@ -26,13 +26,13 @@ See COPYRIGHTS file for copyright information.
>
<UserMacro
Name="CopyConfigH"
- Value="copy ..\..\..\config.h.win32 ..\..\..\config.h"
+ Value="copy ..\..\config.h.win32 ..\..\config.h"
/>
<UserMacro
Name="GenerateLibCrocoDef"
Value="
echo EXPORTS > $(DefDir)\libcroco.def

-cl /EP ..\..\..\src\libcroco.symbols >> $(DefDir)\libcroco.def

+cl /EP ..\..\src\libcroco.symbols >> $(DefDir)\libcroco.def

"
/>
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/croco-install.vcproj b/win32/vs9/croco-install.vcproj
similarity index 100%
rename from build/win32/vs9/croco-install.vcproj
rename to win32/vs9/croco-install.vcproj
diff --git a/build/win32/vs9/croco-install.vspropsin b/win32/vs9/croco-install.vspropsin
similarity index 100%
rename from build/win32/vs9/croco-install.vspropsin
rename to win32/vs9/croco-install.vspropsin
diff --git a/build/win32/vs9/croco-version-paths.vsprops.in b/win32/vs9/croco-version-paths.vsprops.in
similarity index 96%
rename from build/win32/vs9/croco-version-paths.vsprops.in
rename to win32/vs9/croco-version-paths.vsprops.in
index e45823b..ca95e55 100644
--- a/build/win32/vs9/croco-version-paths.vsprops.in
+++ b/win32/vs9/croco-version-paths.vsprops.in
@@ -33,7 +33,7 @@ See COPYRIGHTS file for copyright information.
/>
<UserMacro
Name="GlibEtcInstallRoot"
- Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ Value="$(SolutionDir)\..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
diff --git a/build/win32/vs9/croco.vcprojin b/win32/vs9/croco.vcprojin
similarity index 96%
rename from build/win32/vs9/croco.vcprojin
rename to win32/vs9/croco.vcprojin
index eb30831..82df5a8 100644
--- a/build/win32/vs9/croco.vcprojin
+++ b/win32/vs9/croco.vcprojin
@@ -206,37 +206,37 @@ See COPYRIGHTS file for copyright information.
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File RelativePath="..\..\..\config.h.win32">
+ <File RelativePath="..\..\config.h.win32">
<FileConfiguration Name="Debug|Win32">
<Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(CopyConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(CopyConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(CopyConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(CopyConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
</File>
- <File RelativePath="..\..\..\src\libcroco.symbols">
+ <File RelativePath="..\..\src\libcroco.symbols">
<FileConfiguration Name="Debug|Win32">
<Tool Name="VCCustomBuildTool"
Description="Generating libcroco.def..."
diff --git a/build/win32/vs9/csslint.vcproj b/win32/vs9/csslint.vcproj
similarity index 98%
rename from build/win32/vs9/csslint.vcproj
rename to win32/vs9/csslint.vcproj
index d0235d0..20ede16 100644
--- a/build/win32/vs9/csslint.vcproj
+++ b/win32/vs9/csslint.vcproj
@@ -181,7 +181,7 @@ See COPYRIGHTS file for copyright information.
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\csslint\csslint.c" />
+ <File RelativePath="..\..\csslint\csslint.c" />
</Filter>
</Files>
<Globals>
diff --git a/build/win32/vs9/libcroco.sln b/win32/vs9/libcroco.sln
similarity index 100%
rename from build/win32/vs9/libcroco.sln
rename to win32/vs9/libcroco.sln
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
