[glib-networking: 22/129] Visual Studio builds: Move Projects to win32/
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking: 22/129] Visual Studio builds: Move Projects to win32/
- Date: Sat, 2 Feb 2019 22:45:14 +0000 (UTC)
commit c96220a887582e27c27bc00365b1ae5e3821f7ab
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Feb 23 15:54:40 2017 +0800
Visual Studio builds: Move Projects to win32/
This enables one to go down one less level into the source tree to reach
the project files, as well as getting the autotools modules (Makefile.msvcproj,
Makefile-newvs.am) to be in sync with the ones in GLib master.
This also adds support for Visual Studio 2017, by updating the autotools scripts
to copy the 2010 projects and updating items as necessary to obtain the 2017
projects.
Note that the toolset version string format changed for Visual Studio 2017, so
a custom toolset version string is allowed and used if provided, otherwise it
will be generated as before.
The modules built with Visual Studio 2017 should work without problems with
the 2015-built ones, as 2017 aims to be compatible with 2015 on the CRT level.
Makefile.am | 2 +-
build/Makefile-newvs.am | 41 ------
build/Makefile.am | 1 -
build/Makefile.msvcproj | 110 ---------------
build/win32/Makefile.am | 1 -
configure.ac | 20 ++-
tls/base/Makefile.am | 4 +-
tls/openssl/Makefile.am | 4 +-
win32/Makefile-newvs.am | 55 ++++++++
win32/Makefile.am | 1 +
win32/Makefile.msvcproj | 153 +++++++++++++++++++++
{build/win32 => win32}/vs10/Makefile.am | 0
.../vs10/glib-openssl-build-defines.props | 2 +-
.../vs10/glib-openssl-gen-srcs.props | 2 +-
.../vs10/glib-openssl-install.props | 0
.../vs10/glib-openssl-install.vcxproj | 20 +--
.../vs10/glib-openssl-prepbuild.vcxproj | 20 +--
.../vs10/glib-openssl-prepbuild.vcxproj.filters | 2 +-
.../vs10/glib-openssl-version-paths.props | 2 +-
{build/win32 => win32}/vs10/glib-openssl.sln | 0
.../vs10/libgioopenssl.vcxproj.filtersin | 0
.../win32 => win32}/vs10/libgioopenssl.vcxprojin | 22 +--
.../win32 => win32}/vs10/tlsbase.vcxproj.filtersin | 0
{build/win32 => win32}/vs10/tlsbase.vcxprojin | 0
{build/win32 => win32}/vs11/Makefile.am | 5 +-
{build/win32 => win32}/vs12/Makefile.am | 5 +-
{build/win32 => win32}/vs14/Makefile.am | 5 +-
win32/vs15/Makefile.am | 22 +++
{build/win32 => win32}/vs9/Makefile.am | 0
.../vs9/glib-openssl-build-defines.vsprops | 2 +-
.../vs9/glib-openssl-gen-srcs.vsprops | 2 +-
.../vs9/glib-openssl-install.vcproj | 0
.../vs9/glib-openssl-install.vsprops | 0
.../vs9/glib-openssl-prepbuild.vcproj | 10 +-
.../vs9/glib-openssl-version-paths.vsprops | 2 +-
{build/win32 => win32}/vs9/glib-openssl.sln | 0
{build/win32 => win32}/vs9/libgioopenssl.vcprojin | 8 +-
{build/win32 => win32}/vs9/tlsbase.vcprojin | 0
38 files changed, 294 insertions(+), 229 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 94a4603..b8aa768 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/glib-openssl.mk
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = po tls/base tls/openssl tls/tests build
+SUBDIRS = po tls/base tls/openssl tls/tests win32
install-exec-hook:
if test -n "$(GIO_QUERYMODULES)" -a -z "$(DESTDIR)"; then \
diff --git a/configure.ac b/configure.ac
index d89988d..9201cf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,18 +132,24 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-Werror=declaration-after-statement"
fi
+dnl ****************************************************
+dnl *** Check whether MSVC toolset is explicitly set ***
+dnl ****************************************************
+AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
+AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
+
dnl *****************************
dnl *** done ***
dnl *****************************
AC_CONFIG_FILES([Makefile
config.h.win32
- build/Makefile
- build/win32/Makefile
- build/win32/vs9/Makefile
- build/win32/vs10/Makefile
- build/win32/vs11/Makefile
- build/win32/vs12/Makefile
- build/win32/vs14/Makefile
+ win32/Makefile
+ win32/vs9/Makefile
+ win32/vs10/Makefile
+ win32/vs11/Makefile
+ win32/vs12/Makefile
+ win32/vs14/Makefile
+ win32/vs15/Makefile
po/Makefile.in po/Makefile
tls/base/Makefile
tls/openssl/Makefile
diff --git a/tls/base/Makefile.am b/tls/base/Makefile.am
index ce5e64f..ac8cc58 100644
--- a/tls/base/Makefile.am
+++ b/tls/base/Makefile.am
@@ -21,5 +21,5 @@ MSVCPROJS = tlsbase
tlsbase_FILES = $(libtlsbase_la_SOURCES)
tlsbase_EXCLUDES = dummy
-include $(top_srcdir)/build/Makefile.msvcproj
-dist-hook: $(top_builddir)/build/win32/vs9/tlsbase.vcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
+dist-hook: $(top_builddir)/win32/vs9/tlsbase.vcproj
diff --git a/tls/openssl/Makefile.am b/tls/openssl/Makefile.am
index 4a387f0..2f3ac38 100644
--- a/tls/openssl/Makefile.am
+++ b/tls/openssl/Makefile.am
@@ -43,6 +43,6 @@ MSVCPROJS = libgioopenssl
libgioopenssl_FILES = $(libgioopenssl_la_SOURCES)
libgioopenssl_EXCLUDES = dummy
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
-dist-hook: $(top_builddir)/build/win32/vs9/libgioopenssl.vcproj
+dist-hook: $(top_builddir)/win32/vs9/libgioopenssl.vcproj
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/win32/Makefile.am b/win32/Makefile.am
new file mode 100644
index 0000000..5eb67d3
--- /dev/null
+++ b/win32/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = vs9 vs10 vs11 vs12 vs14 vs15
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 100%
rename from build/win32/vs10/Makefile.am
rename to win32/vs10/Makefile.am
diff --git a/build/win32/vs10/glib-openssl-build-defines.props b/win32/vs10/glib-openssl-build-defines.props
similarity index 85%
rename from build/win32/vs10/glib-openssl-build-defines.props
rename to win32/vs10/glib-openssl-build-defines.props
index 16c37cf..a9ca695 100644
--- a/build/win32/vs10/glib-openssl-build-defines.props
+++ b/win32/vs10/glib-openssl-build-defines.props
@@ -13,7 +13,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_CONFIG_H;G_LOG_DOMAIN="GLib-Net";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/build/win32/vs10/glib-openssl-gen-srcs.props b/win32/vs10/glib-openssl-gen-srcs.props
similarity index 88%
rename from build/win32/vs10/glib-openssl-gen-srcs.props
rename to win32/vs10/glib-openssl-gen-srcs.props
index 6ee87bc..f184d11 100644
--- a/build/win32/vs10/glib-openssl-gen-srcs.props
+++ b/win32/vs10/glib-openssl-gen-srcs.props
@@ -4,7 +4,7 @@
<Import Project="glib-openssl-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+ <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>glibopensslgensrcsprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs10/glib-openssl-install.props b/win32/vs10/glib-openssl-install.props
similarity index 100%
rename from build/win32/vs10/glib-openssl-install.props
rename to win32/vs10/glib-openssl-install.props
diff --git a/build/win32/vs10/glib-openssl-install.vcxproj b/win32/vs10/glib-openssl-install.vcxproj
similarity index 75%
rename from build/win32/vs10/glib-openssl-install.vcxproj
rename to win32/vs10/glib-openssl-install.vcxproj
index 34e3707..587d0e2 100644
--- a/build/win32/vs10/glib-openssl-install.vcxproj
+++ b/win32/vs10/glib-openssl-install.vcxproj
@@ -74,19 +74,13 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</ItemDefinitionGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\random_file">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying Build Results...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\random_file_a;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying Build Results...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\random_file_a;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying Build Results...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\random_file_a;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying Build Results...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\random_file_a;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\random_file">
+ <Message Condition="'$(Configuration)'=='Debug'">Copying Build Results...</Message>
+ <Command
Condition="'$(Configuration)'=='Debug'">$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\random_file_a;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Copying Build Results...</Message>
+ <Command
Condition="'$(Configuration)'=='Release'">$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\random_file_a;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
diff --git a/build/win32/vs10/glib-openssl-prepbuild.vcxproj b/win32/vs10/glib-openssl-prepbuild.vcxproj
similarity index 75%
rename from build/win32/vs10/glib-openssl-prepbuild.vcxproj
rename to win32/vs10/glib-openssl-prepbuild.vcxproj
index 54ded4e..401d298 100644
--- a/build/win32/vs10/glib-openssl-prepbuild.vcxproj
+++ b/win32/vs10/glib-openssl-prepbuild.vcxproj
@@ -68,19 +68,13 @@
<ItemDefinitionGroup>
</ItemDefinitionGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h...</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...</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...</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...</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...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Copying config.h...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/build/win32/vs10/glib-openssl-prepbuild.vcxproj.filters
b/win32/vs10/glib-openssl-prepbuild.vcxproj.filters
similarity index 80%
rename from build/win32/vs10/glib-openssl-prepbuild.vcxproj.filters
rename to win32/vs10/glib-openssl-prepbuild.vcxproj.filters
index 7fafc5c..7c23278 100644
--- a/build/win32/vs10/glib-openssl-prepbuild.vcxproj.filters
+++ b/win32/vs10/glib-openssl-prepbuild.vcxproj.filters
@@ -7,6 +7,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/glib-openssl-version-paths.props b/win32/vs10/glib-openssl-version-paths.props
similarity index 90%
rename from build/win32/vs10/glib-openssl-version-paths.props
rename to win32/vs10/glib-openssl-version-paths.props
index 3a9458f..71695a7 100644
--- a/build/win32/vs10/glib-openssl-version-paths.props
+++ b/win32/vs10/glib-openssl-version-paths.props
@@ -4,7 +4,7 @@
</ImportGroup>
<PropertyGroup Label="UserMacros">
<VSVer>10</VSVer>
- <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
</PropertyGroup>
<PropertyGroup>
diff --git a/build/win32/vs10/glib-openssl.sln b/win32/vs10/glib-openssl.sln
similarity index 100%
rename from build/win32/vs10/glib-openssl.sln
rename to win32/vs10/glib-openssl.sln
diff --git a/build/win32/vs10/libgioopenssl.vcxproj.filtersin b/win32/vs10/libgioopenssl.vcxproj.filtersin
similarity index 100%
rename from build/win32/vs10/libgioopenssl.vcxproj.filtersin
rename to win32/vs10/libgioopenssl.vcxproj.filtersin
diff --git a/build/win32/vs10/libgioopenssl.vcxprojin b/win32/vs10/libgioopenssl.vcxprojin
similarity index 88%
rename from build/win32/vs10/libgioopenssl.vcxprojin
rename to win32/vs10/libgioopenssl.vcxprojin
index 86436b9..18f1b7d 100644
--- a/build/win32/vs10/libgioopenssl.vcxprojin
+++ b/win32/vs10/libgioopenssl.vcxprojin
@@ -66,21 +66,11 @@
<Import Project="glib-openssl-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Debug'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Release'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\tls\base;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\tls\base;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;$(ModExportCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
@@ -99,7 +89,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\tls\base;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\tls\base;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;$(ModExportCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
@@ -118,7 +108,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\tls\base;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\tls\base;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(ModExportCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -139,7 +129,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\tls\base;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\tls\base;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(ModExportCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/build/win32/vs10/tlsbase.vcxproj.filtersin b/win32/vs10/tlsbase.vcxproj.filtersin
similarity index 100%
rename from build/win32/vs10/tlsbase.vcxproj.filtersin
rename to win32/vs10/tlsbase.vcxproj.filtersin
diff --git a/build/win32/vs10/tlsbase.vcxprojin b/win32/vs10/tlsbase.vcxprojin
similarity index 100%
rename from build/win32/vs10/tlsbase.vcxprojin
rename to win32/vs10/tlsbase.vcxprojin
diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
similarity index 82%
rename from build/win32/vs11/Makefile.am
rename to win32/vs11/Makefile.am
index acb465a..f53895e 100644
--- a/build/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -13,8 +13,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 82%
rename from build/win32/vs12/Makefile.am
rename to win32/vs12/Makefile.am
index dc66ac3..22f4bad 100644
--- a/build/win32/vs12/Makefile.am
+++ b/win32/vs12/Makefile.am
@@ -13,8 +13,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 81%
rename from build/win32/vs14/Makefile.am
rename to win32/vs14/Makefile.am
index e16bced..3602595 100644
--- a/build/win32/vs14/Makefile.am
+++ b/win32/vs14/Makefile.am
@@ -13,8 +13,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/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
new file mode 100644
index 0000000..73c1866
--- /dev/null
+++ b/win32/vs15/Makefile.am
@@ -0,0 +1,22 @@
+EXTRA_DIST = \
+ glib-openssl.sln \
+ glib-openssl-build-defines.props \
+ glib-openssl-gen-srcs.props \
+ glib-openssl-install.props \
+ glib-openssl-version-paths.props \
+ glib-openssl-install.vcxproj \
+ glib-openssl-prepbuild.vcxproj \
+ libgioopenssl.vcxproj \
+ libgioopenssl.vcxproj.filters \
+ tlsbase.vcxproj \
+ tlsbase.vcxproj.filters
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
+MSVC_VER = 15
+MSVC_VER_LONG = 15
+MSVC_TOOLSET = 141
+
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
similarity index 100%
rename from build/win32/vs9/Makefile.am
rename to win32/vs9/Makefile.am
diff --git a/build/win32/vs9/glib-openssl-build-defines.vsprops b/win32/vs9/glib-openssl-build-defines.vsprops
similarity index 82%
rename from build/win32/vs9/glib-openssl-build-defines.vsprops
rename to win32/vs9/glib-openssl-build-defines.vsprops
index 48901e4..bf5b144 100644
--- a/build/win32/vs9/glib-openssl-build-defines.vsprops
+++ b/win32/vs9/glib-openssl-build-defines.vsprops
@@ -9,7 +9,7 @@
>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
+
AdditionalIncludeDirectories="..\..;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
PreprocessorDefinitions="HAVE_CONFIG_H;G_LOG_DOMAIN=\"GLib-Net\""
ForcedIncludeFiles="msvc_recommended_pragmas.h"
AdditionalOptions="/MP"
diff --git a/build/win32/vs9/glib-openssl-gen-srcs.vsprops b/win32/vs9/glib-openssl-gen-srcs.vsprops
similarity index 83%
rename from build/win32/vs9/glib-openssl-gen-srcs.vsprops
rename to win32/vs9/glib-openssl-gen-srcs.vsprops
index 00767b6..24d5ed7 100644
--- a/build/win32/vs9/glib-openssl-gen-srcs.vsprops
+++ b/win32/vs9/glib-openssl-gen-srcs.vsprops
@@ -7,6 +7,6 @@
>
<UserMacro
Name="CopyConfigH"
- Value="copy ..\..\..\config.h.win32 ..\..\..\config.h"
+ Value="copy ..\..\config.h.win32 ..\..\config.h"
/>
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/glib-openssl-install.vcproj b/win32/vs9/glib-openssl-install.vcproj
similarity index 100%
rename from build/win32/vs9/glib-openssl-install.vcproj
rename to win32/vs9/glib-openssl-install.vcproj
diff --git a/build/win32/vs9/glib-openssl-install.vsprops b/win32/vs9/glib-openssl-install.vsprops
similarity index 100%
rename from build/win32/vs9/glib-openssl-install.vsprops
rename to win32/vs9/glib-openssl-install.vsprops
diff --git a/build/win32/vs9/glib-openssl-prepbuild.vcproj b/win32/vs9/glib-openssl-prepbuild.vcproj
similarity index 87%
rename from build/win32/vs9/glib-openssl-prepbuild.vcproj
rename to win32/vs9/glib-openssl-prepbuild.vcproj
index 400e336..cf1f77c 100644
--- a/build/win32/vs9/glib-openssl-prepbuild.vcproj
+++ b/win32/vs9/glib-openssl-prepbuild.vcproj
@@ -57,11 +57,11 @@
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">
- <FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool"
Description="Copying config.h..." CommandLine="$(CopyConfigH)" Outputs="..\..\..\config.h"
/></FileConfiguration>
- <FileConfiguration Name="Debug|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h..." CommandLine="$(CopyConfigH)" Outputs="..\..\..\config.h"
/></FileConfiguration>
- <FileConfiguration Name="Release|Win32"><Tool Name="VCCustomBuildTool"
Description="Copying config.h..." CommandLine="$(CopyConfigH)" Outputs="..\..\..\config.h"
/></FileConfiguration>
- <FileConfiguration Name="Release|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h..." CommandLine="$(CopyConfigH)" Outputs="..\..\..\config.h"
/></FileConfiguration>
+ <File RelativePath="..\..\config.h.win32">
+ <FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool"
Description="Copying config.h..." CommandLine="$(CopyConfigH)" Outputs="..\..\config.h" /></FileConfiguration>
+ <FileConfiguration Name="Debug|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h..." CommandLine="$(CopyConfigH)" Outputs="..\..\config.h" /></FileConfiguration>
+ <FileConfiguration Name="Release|Win32"><Tool Name="VCCustomBuildTool"
Description="Copying config.h..." CommandLine="$(CopyConfigH)" Outputs="..\..\config.h" /></FileConfiguration>
+ <FileConfiguration Name="Release|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h..." CommandLine="$(CopyConfigH)" Outputs="..\..\config.h" /></FileConfiguration>
</File>
</Filter>
</Files>
diff --git a/build/win32/vs9/glib-openssl-version-paths.vsprops b/win32/vs9/glib-openssl-version-paths.vsprops
similarity index 87%
rename from build/win32/vs9/glib-openssl-version-paths.vsprops
rename to win32/vs9/glib-openssl-version-paths.vsprops
index 07cc9fd..612b059 100644
--- a/build/win32/vs9/glib-openssl-version-paths.vsprops
+++ b/win32/vs9/glib-openssl-version-paths.vsprops
@@ -10,7 +10,7 @@
/>
<UserMacro
Name="GlibEtcInstallRoot"
- Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ Value="..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
diff --git a/build/win32/vs9/glib-openssl.sln b/win32/vs9/glib-openssl.sln
similarity index 100%
rename from build/win32/vs9/glib-openssl.sln
rename to win32/vs9/glib-openssl.sln
diff --git a/build/win32/vs9/libgioopenssl.vcprojin b/win32/vs9/libgioopenssl.vcprojin
similarity index 95%
rename from build/win32/vs9/libgioopenssl.vcprojin
rename to win32/vs9/libgioopenssl.vcprojin
index 5bd8407..db2ac96 100644
--- a/build/win32/vs9/libgioopenssl.vcprojin
+++ b/win32/vs9/libgioopenssl.vcprojin
@@ -30,7 +30,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\tls\base"
+ AdditionalIncludeDirectories="..\..\tls\base"
Optimization="0"
PreprocessorDefinitions="_DEBUG;$(ModExportCFlags)"
MinimalRebuild="true"
@@ -60,7 +60,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\tls\base"
+ AdditionalIncludeDirectories="..\..\tls\base"
Optimization="0"
PreprocessorDefinitions="_DEBUG;$(ModExportCFlags)"
MinimalRebuild="true"
@@ -91,7 +91,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\tls\base"
+ AdditionalIncludeDirectories="..\..\tls\base"
Optimization="2"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="$(ModExportCFlags)"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\tls\base"
+ AdditionalIncludeDirectories="..\..\tls\base"
Optimization="2"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="$(ModExportCFlags)"
diff --git a/build/win32/vs9/tlsbase.vcprojin b/win32/vs9/tlsbase.vcprojin
similarity index 100%
rename from build/win32/vs9/tlsbase.vcprojin
rename to win32/vs9/tlsbase.vcprojin
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
