[atk] Visual Studio projects: Move to win32/
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atk] Visual Studio projects: Move to win32/
- Date: Tue, 10 Jan 2017 10:30:43 +0000 (UTC)
commit 80f310a52682e71df05ccd98b0e79c7603f72164
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Jan 10 18:29:44 2017 +0800
Visual Studio projects: Move to win32/
It was suggested that the project be moved to win32/, so that one will
need to go one less layer down into the tree to reach the project files.
Makefile.am | 2 +-
atk/Makefile.am | 16 +-
build/Makefile-newvs.am | 47 ------
build/Makefile.am | 2 -
build/Makefile.msvcproj | 154 --------------------
configure.ac | 17 +-
win32/Makefile-newvs.am | 46 ++++++
{build/win32 => win32}/Makefile.am | 2 +-
{build => win32}/Makefile.msvc-introspection | 64 ++++----
win32/Makefile.msvcproj | 153 +++++++++++++++++++
{build/win32 => win32}/atk-introspection-msvc.mak | 0
{build/win32 => win32}/atkpc.py | 0
{build/win32 => win32}/detectenv-msvc.mak | 0
{build/win32 => win32}/introspection-msvc.mak | 2 +-
{build/win32 => win32}/pc_base.py | 2 +-
{build/win32 => win32}/replace.py | 0
{build/win32 => win32}/vs10/.gitignore | 0
{build/win32 => win32}/vs10/Makefile.am | 10 +-
{build/win32 => win32}/vs10/README.txt | 4 +-
.../win32 => win32}/vs10/atk-build-defines.props | 2 +-
{build/win32 => win32}/vs10/atk-gen-src.props | 10 +-
{build/win32 => win32}/vs10/atk-install.propsin | 0
{build/win32 => win32}/vs10/atk-install.vcxproj | 41 ++----
.../vs10/atk-install.vcxproj.filters | 4 +-
.../vs10/atk-version-paths.props.in | 2 +-
{build/win32 => win32}/vs10/atk.sln | 0
{build/win32 => win32}/vs10/atk.vcxproj.filtersin | 6 +-
{build/win32 => win32}/vs10/atk.vcxprojin | 48 ++----
{build/win32 => win32}/vs11/Makefile.am | 2 +-
{build/win32 => win32}/vs12/Makefile.am | 2 +-
{build/win32 => win32}/vs14/Makefile.am | 2 +-
{build/win32 => win32}/vs9/.gitignore | 0
{build/win32 => win32}/vs9/Makefile.am | 4 +-
{build/win32 => win32}/vs9/README.txt | 4 +-
.../win32 => win32}/vs9/atk-build-defines.vsprops | 2 +-
{build/win32 => win32}/vs9/atk-gen-src.vsprops | 8 +-
{build/win32 => win32}/vs9/atk-install.vcproj | 2 +-
{build/win32 => win32}/vs9/atk-install.vspropsin | 0
.../vs9/atk-version-paths.vsprops.in | 2 +-
{build/win32 => win32}/vs9/atk.sln | 0
{build/win32 => win32}/vs9/atk.vcprojin | 22 ++--
41 files changed, 321 insertions(+), 363 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6c5fe01..aafb628 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Process this file with automake to create Makefile.in.
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS=atk tests docs po build
+SUBDIRS=atk tests docs po win32
EXTRA_DIST = \
MAINTAINERS \
diff --git a/atk/Makefile.am b/atk/Makefile.am
index 875f616..660b26b 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -213,17 +213,17 @@ atk_EXCLUDES = atkdummy
atk_HEADERS_DIR = $(libatkincludedir)
atk_HEADERS_INST = $(libatkinclude_HEADERS) atkversion.h
-atk_HEADERS_EXCLUDES = $(top_builddir)/atk/atkversion.h
+atk_HEADERS_EXCLUDES = $(builddir)/atkversion.h
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
if HAVE_INTROSPECTION
# Introspection Items for MSVC
MSVC_INTROSPECT_GIRS = Atk-1.0.gir
INTROSPECTION_INTERMEDIATE_ITEMS = \
- $(top_builddir)/build/win32/Atk-1.0.gir.msvc.introspect \
- $(top_builddir)/build/win32/Atk_1_0_gir_list
+ $(top_builddir)/win32/Atk-1.0.gir.msvc.introspect \
+ $(top_builddir)/win32/Atk_1_0_gir_list
Atk_1_0_gir_MSVC_EXPORT_PACKAGES = atk
Atk_1_0_gir_MSVC_INCLUDE_GIRS = $(Atk_1_0_gir_INCLUDES)
@@ -235,7 +235,7 @@ Atk_1_0_gir_MSVC_FILES = \
atk-enum-types.h
Atk_1_0_gir_MSVC_CFLAGS = \
- -I../.. \
+ -I.. \
-DG_DISABLE_DEPRECATED \
-DATK_DISABLE_DEPRECATED \
-DATK_COMPILATION \
@@ -243,15 +243,15 @@ Atk_1_0_gir_MSVC_CFLAGS = \
Atk_1_0_gir_MSVC_SCANNERFLAGS = --warn-all --c-include "atk/atk.h"
-include $(top_srcdir)/build/Makefile.msvc-introspection
+include $(top_srcdir)/win32/Makefile.msvc-introspection
else
INTROSPECTION_INTERMEDIATE_ITEMS =
endif
dist-hook: \
- $(top_builddir)/build/win32/vs9/atk.vcproj \
- $(top_builddir)/build/win32/vs9/atk.headers \
+ $(top_builddir)/win32/vs9/atk.vcproj \
+ $(top_builddir)/win32/vs9/atk.headers \
$(INTROSPECTION_INTERMEDIATE_ITEMS)
distclean-local:
diff --git a/configure.ac b/configure.ac
index 1d14d7b..19de1d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,15 +254,14 @@ atk/Makefile
atk/atk.rc
atk/atkversion.h
tests/Makefile
-build/Makefile
-build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs9/atk-version-paths.vsprops
-build/win32/vs10/Makefile
-build/win32/vs10/atk-version-paths.props
-build/win32/vs11/Makefile
-build/win32/vs12/Makefile
-build/win32/vs14/Makefile
+win32/Makefile
+win32/vs9/Makefile
+win32/vs9/atk-version-paths.vsprops
+win32/vs10/Makefile
+win32/vs10/atk-version-paths.props
+win32/vs11/Makefile
+win32/vs12/Makefile
+win32/vs14/Makefile
docs/Makefile
docs/version.xml
atk.spec
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
new file mode 100644
index 0000000..ecdf3b5
--- /dev/null
+++ b/win32/Makefile-newvs.am
@@ -0,0 +1,46 @@
+# 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 (10 for 2010, 11 for 2012, 12
for 2013, 14 for 2015 and so on)
+# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14 and so on)
+# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on)
+# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015
+
+%.sln:
+ sed 's/11\.00/$(MSVC_FORMAT_VER)\.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_VER)0/v$(MSVC_VER)0/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ >
$(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ else \
+ sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/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 91%
rename from build/win32/Makefile.am
rename to win32/Makefile.am
index 4d0a309..a04ef72 100644
--- a/build/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -7,7 +7,7 @@ introspection.body.mak: Atk-1.0.gir.msvc.introspect
-$(RM) introspection.body.mak
for F in `ls *.msvc.introspect`; do \
case $$F in \
- *) cat $(top_builddir)/build/win32/$$F >>$@ \
+ *) cat $(top_builddir)/win32/$$F >>$@ \
;; \
esac; \
done
diff --git a/build/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection
similarity index 66%
rename from build/Makefile.msvc-introspection
rename to win32/Makefile.msvc-introspection
index 6c90964..370bcb9 100644
--- a/build/Makefile.msvc-introspection
+++ b/win32/Makefile.msvc-introspection
@@ -2,7 +2,7 @@
# Common autotools file for constructing the g-ir-scanner and
# g-ir-compiler command lines for Visual Studio builds.
-# This is copied from $(srcroot)/build from the gobject-introspection
+# This is copied from the gobject-introspection
# project, which may be included in projects that support both
# Visual Studio builds and introspection.
@@ -18,7 +18,7 @@
# is required unless --headers-only is specified in
# YourLib_1_0_gir__MSVC_SCANNERFLAGS)
#
-# include $(top_srcdir)/build/Makefile.msvc-introspection
+# include $(top_srcdir)/Makefile.msvc-introspection
# MSVC_INTROSPECT_GIRS = YourLib-1.0.gir
# YourLib_1_0_gir_NAMESPACE = YourLib # This is optional
# YourLib_1_0_gir_VERSION = 1.0 # This is optional
@@ -79,47 +79,47 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
$($(_gir_name)_MSVC_PROGRAM)),,
$(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
-$(top_builddir)/build/win32/$(_gir_name)_list:
+$(top_builddir)/win32/$(_gir_name)_list:
for F in $(_gir_files_msvc); do \
case $$$$F in \
*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
- echo '..\..'$(_gir_source_subdir_msvc)$$$$F
$(top_builddir)/build/win32/$(_gir_name)_list \
+ echo '..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list \
;; \
esac; \
done
-$(top_builddir)/build/win32/$(1).msvc.introspect:
- -$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect
+$(top_builddir)/win32/$(1).msvc.introspect:
+ -$(RM) $(top_builddir)/win32/$(1).msvc.introspect
# Assemble the Command to Run g-ir-scanner
- echo $(1)': '$(_gir_name)'_list
'$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' @-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --verbose -no-libtool \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR)
\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --cflags-begin \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --cflags-end \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
+ echo $(1)': '$(_gir_name)'_list
'$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' @-echo Generating $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --verbose -no-libtool \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --cflags-begin \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --cflags-end \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
# Finally Assemble the Command to Compile the generated .gir
- echo '$(_typelib_basename_msvc).typelib:
'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --includedir=. --debug --verbose \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(1)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
+ echo '$(_typelib_basename_msvc).typelib:
'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --includedir=. --debug --verbose \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(1)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
endef
$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir))))
diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj
new file mode 100644
index 0000000..fe15b8d
--- /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 $(top_srcdir)/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/atk-introspection-msvc.mak b/win32/atk-introspection-msvc.mak
similarity index 100%
rename from build/win32/atk-introspection-msvc.mak
rename to win32/atk-introspection-msvc.mak
diff --git a/build/win32/atkpc.py b/win32/atkpc.py
similarity index 100%
rename from build/win32/atkpc.py
rename to win32/atkpc.py
diff --git a/build/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak
similarity index 100%
rename from build/win32/detectenv-msvc.mak
rename to win32/detectenv-msvc.mak
diff --git a/build/win32/introspection-msvc.mak b/win32/introspection-msvc.mak
similarity index 98%
rename from build/win32/introspection-msvc.mak
rename to win32/introspection-msvc.mak
index 8739844..26501f5 100644
--- a/build/win32/introspection-msvc.mak
+++ b/win32/introspection-msvc.mak
@@ -8,7 +8,7 @@
# Change or pass in or set the following to suit your environment
!if "$(PREFIX)" == ""
-PREFIX = ..\..\..\vs$(VSVER)\$(PLAT)
+PREFIX = ..\..\vs$(VSVER)\$(PLAT)
!endif
!if ![setlocal] && \
diff --git a/build/win32/pc_base.py b/win32/pc_base.py
similarity index 99%
rename from build/win32/pc_base.py
rename to win32/pc_base.py
index 587ba83..285b6cd 100644
--- a/build/win32/pc_base.py
+++ b/win32/pc_base.py
@@ -23,7 +23,7 @@ class BasePCItems:
self.libdir = ''
self.prefix = ''
self.srcdir = os.path.dirname(__file__)
- self.top_srcdir = self.srcdir + '\\..\\..'
+ self.top_srcdir = self.srcdir + '\\..'
self.version = ''
def setup(self, argv, parser=None):
diff --git a/build/win32/replace.py b/win32/replace.py
similarity index 100%
rename from build/win32/replace.py
rename to win32/replace.py
diff --git a/build/win32/vs10/.gitignore b/win32/vs10/.gitignore
similarity index 100%
rename from build/win32/vs10/.gitignore
rename to win32/vs10/.gitignore
diff --git a/build/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
similarity index 54%
rename from build/win32/vs10/Makefile.am
rename to win32/vs10/Makefile.am
index 64a1d24..6f7acee 100644
--- a/build/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -16,11 +16,11 @@ EXTRA_DIST = \
atk-version-paths.props \
$(GENERATED_ITEMS)
-atk-install.props: $(top_srcdir)/build/win32/vs10/atk-install.propsin atk.vs10.headers
- -$(RM) $(top_builddir)/build/win32/vs11/atk-install.props
- -$(RM) $(top_builddir)/build/win32/vs12/atk-install.props
- -$(RM) $(top_builddir)/build/win32/vs14/atk-install.props
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/atk-install.propsin >$@
+atk-install.props: $(top_srcdir)/win32/vs10/atk-install.propsin atk.vs10.headers
+ -$(RM) $(top_builddir)/win32/vs11/atk-install.props
+ -$(RM) $(top_builddir)/win32/vs12/atk-install.props
+ -$(RM) $(top_builddir)/win32/vs14/atk-install.props
+ $(CPP) -P - <$(top_srcdir)/win32/vs10/atk-install.propsin >$@
rm atk.vs10.headers
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs10/README.txt b/win32/vs10/README.txt
similarity index 94%
rename from build/win32/vs10/README.txt
rename to win32/vs10/README.txt
index df81da3..1efbcfa 100644
--- a/build/win32/vs10/README.txt
+++ b/win32/vs10/README.txt
@@ -49,7 +49,7 @@ folder <root>:
<root>\vs10\<PlatformName>
*this* file you are now reading is thus located at
-<root>\atk\<this-atk-source-tree>\build\win32\vs10\README.
+<root>\atk\<this-atk-source-tree>\win32\vs10\README.
<PlatformName> is either Win32 or x64, as in VS10 project files.
@@ -70,7 +70,7 @@ If you build any of the dependencies yourselves, copy the:
If you have not built GLib with VS10 and placed the LIBs and headers in a
place where VS10 can find them automatically, you should also uncompress
your GLib sources in <root>\ and build it from there, following the
-instructions in <root>\glib<-version>\build\win32\vs10, so that the required
+instructions in <root>\glib<-version>\win32\vs10, so that the required
headers, EXEs, DLLs and LIBs will end up in
<root>\vs10\<PlatformName>\include\glib-2.0 (headers)
<root>\vs10\<PlatformName>\lib (LIBs, also glib-2.0/include/glibocnfig.h)
diff --git a/build/win32/vs10/atk-build-defines.props b/win32/vs10/atk-build-defines.props
similarity index 87%
rename from build/win32/vs10/atk-build-defines.props
rename to win32/vs10/atk-build-defines.props
index f30c298..8e50c01 100644
--- a/build/win32/vs10/atk-build-defines.props
+++ b/win32/vs10/atk-build-defines.props
@@ -13,7 +13,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..;..\..\..\atk;$(GLibEtcInstallRoot)\include\glib-2.0;$(GLibEtcInstallRoot)\lib\glib-2.0\include;$(GLibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..;..\..\atk;$(GLibEtcInstallRoot)\include\glib-2.0;$(GLibEtcInstallRoot)\lib\glib-2.0\include;$(GLibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/build/win32/vs10/atk-gen-src.props b/win32/vs10/atk-gen-src.props
similarity index 85%
rename from build/win32/vs10/atk-gen-src.props
rename to win32/vs10/atk-gen-src.props
index 4c1fb10..06bec83 100644
--- a/build/win32/vs10/atk-gen-src.props
+++ b/win32/vs10/atk-gen-src.props
@@ -4,15 +4,9 @@
<Import Project="atk-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <GenConfigH>
-if exist ..\..\..\config.h goto DONE_CONFIG_H
-
-copy ..\..\..\config.h.win32 ..\..\..\config.h
-
-:DONE_CONFIG_H
- </GenConfigH>
+ <GenConfigH>if exist ..\..\config.h copy ..\..\config.h.win32 ..\..\config.h</GenConfigH>
<GenMarshalSrc>
-cd ..\..\..\atk
+cd ..\..\atk
$(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --header > atkmarshal.h
diff --git a/build/win32/vs10/atk-install.propsin b/win32/vs10/atk-install.propsin
similarity index 100%
rename from build/win32/vs10/atk-install.propsin
rename to win32/vs10/atk-install.propsin
diff --git a/build/win32/vs10/atk-install.vcxproj b/win32/vs10/atk-install.vcxproj
similarity index 68%
rename from build/win32/vs10/atk-install.vcxproj
rename to win32/vs10/atk-install.vcxproj
index cd50bde..2b36db2 100644
--- a/build/win32/vs10/atk-install.vcxproj
+++ b/win32/vs10/atk-install.vcxproj
@@ -66,15 +66,10 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibEtcInstallRoot)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibEtcInstallRoot)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibEtcInstallRoot)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <OutDir Condition="'$(Configuration)'=='Debug'">$(GLibEtcInstallRoot)\</OutDir>
+ <IntDir Condition="'$(Configuration)'=='Debug'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)'=='Release'">$(GLibEtcInstallRoot)\</OutDir>
+ <IntDir Condition="'$(Configuration)'=='Release'">$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ItemDefinitionGroup>
@@ -85,25 +80,17 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</ItemDefinitionGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(AtkPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(AtkDoInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(AtkPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(AtkDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(AtkPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(AtkDoInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(AtkPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(AtkDoInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\config.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
+ <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(AtkPCFiles)</AdditionalInputs>
+ <Command Condition="'$(Configuration)'=='Debug'">$(AtkDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">$(InstalledDlls);%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
+ <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(AtkPCFiles)</AdditionalInputs>
+ <Command Condition="'$(Configuration)'=='Release'">$(AtkDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">$(InstalledDlls);%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\..\..\atk.pc.in">
+ <CustomBuild Include="..\..\atk.pc.in">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating atk.pc...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(AtkGenPC)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(AtkPCFiles);%(Outputs)</Outputs>
diff --git a/build/win32/vs10/atk-install.vcxproj.filters b/win32/vs10/atk-install.vcxproj.filters
similarity index 69%
rename from build/win32/vs10/atk-install.vcxproj.filters
rename to win32/vs10/atk-install.vcxproj.filters
index 946051b..c004f98 100644
--- a/build/win32/vs10/atk-install.vcxproj.filters
+++ b/win32/vs10/atk-install.vcxproj.filters
@@ -7,7 +7,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
- <CustomBuild Include="..\..\..\atk.pc.in"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\atk.pc.in"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/atk-version-paths.props.in b/win32/vs10/atk-version-paths.props.in
similarity index 96%
rename from build/win32/vs10/atk-version-paths.props.in
rename to win32/vs10/atk-version-paths.props.in
index 1c862a0..6cdbefa 100644
--- a/build/win32/vs10/atk-version-paths.props.in
+++ b/win32/vs10/atk-version-paths.props.in
@@ -6,7 +6,7 @@
<AtkMajorVersion>@ATK_MAJOR_VERSION@</AtkMajorVersion>
<AtkMinorVersion>@ATK_MINOR_VERSION@</AtkMinorVersion>
<AtkMicroVersion>@ATK_MICRO_VERSION@</AtkMicroVersion>
- <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GLibEtcInstallRoot)</CopyDir>
<AtkLibtoolCompatibleDllPrefix>lib</AtkLibtoolCompatibleDllPrefix>
<AtkLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</AtkLibtoolCompatibleDllSuffix>
diff --git a/build/win32/vs10/atk.sln b/win32/vs10/atk.sln
similarity index 100%
rename from build/win32/vs10/atk.sln
rename to win32/vs10/atk.sln
diff --git a/build/win32/vs10/atk.vcxproj.filtersin b/win32/vs10/atk.vcxproj.filtersin
similarity index 79%
rename from build/win32/vs10/atk.vcxproj.filtersin
rename to win32/vs10/atk.vcxproj.filtersin
index cbc94a4..0e5ec63 100644
--- a/build/win32/vs10/atk.vcxproj.filtersin
+++ b/win32/vs10/atk.vcxproj.filtersin
@@ -18,11 +18,11 @@
#include "atk.vs10.sourcefiles.filters"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
- <CustomBuild Include="..\..\..\atk\atkmarshal.list"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\atk\atkmarshal.list"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\atk\atk.rc">
+ <ResourceCompile Include="..\..\atk\atk.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/build/win32/vs10/atk.vcxprojin b/win32/vs10/atk.vcxprojin
similarity index 71%
rename from build/win32/vs10/atk.vcxprojin
rename to win32/vs10/atk.vcxprojin
index f37b8c9..4f96b7c 100644
--- a/build/win32/vs10/atk.vcxprojin
+++ b/win32/vs10/atk.vcxprojin
@@ -66,10 +66,8 @@
</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'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -160,37 +158,25 @@
#include "atk.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'">$(GenConfigH)</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'">$(GenConfigH)</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'">$(GenConfigH)</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'">$(GenConfigH)</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'">$(GenConfigH)</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'">$(GenConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\..\..\atk\atkmarshal.list">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Marshalling
Sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenMarshalSrc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Marshalling
Sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenMarshalSrc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Marshalling
Sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenMarshalSrc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Marshalling
Sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenMarshalSrc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\atk\atkmarshal.list">
+ <Message Condition="'$(Configuration)'=='Debug'">Generating Marshalling Sources...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenMarshalSrc)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Debug'">..\..\atk\atkmarshal.h;..\..\atk\atkmarshal.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Generating Marshalling Sources...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenMarshalSrc)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Release'">..\..\atk\atkmarshal.h;..\..\atk\atkmarshal.c;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\atk\atk.rc" />
+ <ResourceCompile Include="..\..\atk\atk.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
similarity index 89%
rename from build/win32/vs11/Makefile.am
rename to win32/vs11/Makefile.am
index fc94c3d..f359f02 100644
--- a/build/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -20,4 +20,4 @@ MSVC_VER = 11
MSVC_VER_LONG = 2012
MSVC_FORMAT_VER = 12
-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 89%
rename from build/win32/vs12/Makefile.am
rename to win32/vs12/Makefile.am
index e24740c..8649d29 100644
--- a/build/win32/vs12/Makefile.am
+++ b/win32/vs12/Makefile.am
@@ -20,4 +20,4 @@ MSVC_VER = 12
MSVC_VER_LONG = 2013
MSVC_FORMAT_VER = 12
-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 89%
rename from build/win32/vs14/Makefile.am
rename to win32/vs14/Makefile.am
index bdaef8b..1a6b3d4 100644
--- a/build/win32/vs14/Makefile.am
+++ b/win32/vs14/Makefile.am
@@ -20,4 +20,4 @@ MSVC_VER = 14
MSVC_VER_LONG = 14
MSVC_FORMAT_VER = 12
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs9/.gitignore b/win32/vs9/.gitignore
similarity index 100%
rename from build/win32/vs9/.gitignore
rename to win32/vs9/.gitignore
diff --git a/build/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
similarity index 66%
rename from build/win32/vs9/Makefile.am
rename to win32/vs9/Makefile.am
index 69af53f..f0d98f8 100644
--- a/build/win32/vs9/Makefile.am
+++ b/win32/vs9/Makefile.am
@@ -13,8 +13,8 @@ EXTRA_DIST = \
atk-version-paths.vsprops \
$(GENERATED_ITEMS)
-atk-install.vsprops: $(top_srcdir)/build/win32/vs9/atk-install.vspropsin atk.headers
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/atk-install.vspropsin >$@
+atk-install.vsprops: $(top_srcdir)/win32/vs9/atk-install.vspropsin atk.headers
+ $(CPP) -P - <$(top_srcdir)/win32/vs9/atk-install.vspropsin >$@
rm atk.headers
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs9/README.txt b/win32/vs9/README.txt
similarity index 94%
rename from build/win32/vs9/README.txt
rename to win32/vs9/README.txt
index 4b5dd54..ad90fe2 100644
--- a/build/win32/vs9/README.txt
+++ b/win32/vs9/README.txt
@@ -49,7 +49,7 @@ folder <root>:
<root>\vs9\<PlatformName>
*this* file you are now reading is thus located at
-<root>\atk\<this-atk-source-tree>\build\win32\vs9\README.
+<root>\atk\<this-atk-source-tree>\win32\vs9\README.
<PlatformName> is either Win32 or x64, as in VS9 project files.
@@ -70,7 +70,7 @@ If you build any of the dependencies yourselves, copy the:
If you have not built GLib with VS9 and placed the LIBs and headers in a
place where VS9 can find them automatically, you should also uncompress
your GLib sources in <root>\ and build it from there, following the
-instructions in <root>\glib<-version>\build\win32\vs9, so that the required
+instructions in <root>\glib<-version>\win32\vs9, so that the required
headers, EXEs, DLLs and LIBs will end up in
<root>\vs9\<PlatformName>\include\glib-2.0 (headers)
<root>\vs9\<PlatformName>\lib (LIBs, also glib-2.0/include/glibocnfig.h)
diff --git a/build/win32/vs9/atk-build-defines.vsprops b/win32/vs9/atk-build-defines.vsprops
similarity index 83%
rename from build/win32/vs9/atk-build-defines.vsprops
rename to win32/vs9/atk-build-defines.vsprops
index 1108cf0..fc7b509 100644
--- a/build/win32/vs9/atk-build-defines.vsprops
+++ b/win32/vs9/atk-build-defines.vsprops
@@ -9,7 +9,7 @@
>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..;..\..\..\atk;$(GLibEtcInstallRoot)\include\glib-2.0;$(GLibEtcInstallRoot)\lib\glib-2.0\include;$(GLibEtcInstallRoot)\include"
+
AdditionalIncludeDirectories="..\..;..\..\atk;$(GLibEtcInstallRoot)\include\glib-2.0;$(GLibEtcInstallRoot)\lib\glib-2.0\include;$(GLibEtcInstallRoot)\include"
PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
AdditionalOptions="/MP"
diff --git a/build/win32/vs9/atk-gen-src.vsprops b/win32/vs9/atk-gen-src.vsprops
similarity index 75%
rename from build/win32/vs9/atk-gen-src.vsprops
rename to win32/vs9/atk-gen-src.vsprops
index 6641ee9..7e39862 100644
--- a/build/win32/vs9/atk-gen-src.vsprops
+++ b/win32/vs9/atk-gen-src.vsprops
@@ -7,16 +7,12 @@
>
<UserMacro
Name="GenConfigH"
- Value="
-if exist ..\..\..\config.h goto DONE_CONFIG_H

-copy ..\..\..\config.h.win32 ..\..\..\config.h

-:DONE_CONFIG_H

- "
+ Value="if not exist ..\..\config.h copy ..\..\config.h.win32 ..\..\config.h"
/>
<UserMacro
Name="GenMarshalSrc"
Value="
-cd ..\..\..\atk

+cd ..\..\atk

$(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --header >
atkmarshal.h

$(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --body >
atkmarshal.c

cd $(SolutionDir)

diff --git a/build/win32/vs9/atk-install.vcproj b/win32/vs9/atk-install.vcproj
similarity index 98%
rename from build/win32/vs9/atk-install.vcproj
rename to win32/vs9/atk-install.vcproj
index 8043747..ff970ce 100644
--- a/build/win32/vs9/atk-install.vcproj
+++ b/win32/vs9/atk-install.vcproj
@@ -81,7 +81,7 @@
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="..\..\..\atk.pc.in">
+ <File RelativePath="..\..\atk.pc.in">
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
diff --git a/build/win32/vs9/atk-install.vspropsin b/win32/vs9/atk-install.vspropsin
similarity index 100%
rename from build/win32/vs9/atk-install.vspropsin
rename to win32/vs9/atk-install.vspropsin
diff --git a/build/win32/vs9/atk-version-paths.vsprops.in b/win32/vs9/atk-version-paths.vsprops.in
similarity index 95%
rename from build/win32/vs9/atk-version-paths.vsprops.in
rename to win32/vs9/atk-version-paths.vsprops.in
index c56b0ac..e916d53 100644
--- a/build/win32/vs9/atk-version-paths.vsprops.in
+++ b/win32/vs9/atk-version-paths.vsprops.in
@@ -26,7 +26,7 @@
/>
<UserMacro
Name="GLibEtcInstallRoot"
- Value="$(SolutionDir)\..\..\..\..\vs$(VSVER)\$(PlatformName)"
+ Value="$(SolutionDir)\..\..\..\vs$(VSVER)\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
diff --git a/build/win32/vs9/atk.sln b/win32/vs9/atk.sln
similarity index 100%
rename from build/win32/vs9/atk.sln
rename to win32/vs9/atk.sln
diff --git a/build/win32/vs9/atk.vcprojin b/win32/vs9/atk.vcprojin
similarity index 91%
rename from build/win32/vs9/atk.vcprojin
rename to win32/vs9/atk.vcprojin
index 5d2a578..69c354d 100644
--- a/build/win32/vs9/atk.vcprojin
+++ b/win32/vs9/atk.vcprojin
@@ -167,13 +167,13 @@
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="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -181,7 +181,7 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -189,7 +189,7 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -197,17 +197,17 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
</File>
- <File RelativePath="..\..\..\atk\atkmarshal.list">
+ <File RelativePath="..\..\atk\atkmarshal.list">
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating Marshalling Sources..."
CommandLine="$(GenMarshalSrc)"
- Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+ Outputs="..\..\atk\atkmarshal.h;..\..\atk\atkmarshal.c"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -215,7 +215,7 @@
Name="VCCustomBuildTool"
Description="Generating Marshalling Sources..."
CommandLine="$(GenMarshalSrc)"
- Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+ Outputs="..\..\atk\atkmarshal.h;..\..\atk\atkmarshal.c"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -223,7 +223,7 @@
Name="VCCustomBuildTool"
Description="Generating Marshalling Sources..."
CommandLine="$(GenMarshalSrc)"
- Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+ Outputs="..\..\atk\atkmarshal.h;..\..\atk\atkmarshal.c"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -231,11 +231,11 @@
Name="VCCustomBuildTool"
Description="Generating Marshalling Sources..."
CommandLine="$(GenMarshalSrc)"
- Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+ Outputs="..\..\atk\atkmarshal.h;..\..\atk\atkmarshal.c"
/>
</FileConfiguration>
</File>
- <File RelativePath="..\..\..\atk\atk.rc" />
+ <File RelativePath="..\..\atk\atk.rc" />
</Filter>
</Files>
<Globals>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
