[gtksourceview/gnome-3-24] Visual Studio builds: Move projects to win32/
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/gnome-3-24] Visual Studio builds: Move projects to win32/
- Date: Fri, 17 Feb 2017 07:56:30 +0000 (UTC)
commit ccc7ae0de46ac09d493d90d0e4db92363c853df7
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Feb 17 15:28:35 2017 +0800
Visual Studio builds: Move projects to win32/
Move the projects to win32 so that we can have one less level to go down into to reach
the project files, and was suggested by Dan Winship previously
Makefile.am | 2 +-
build/Makefile-newvs.am | 45 ------
build/Makefile.am | 3 -
build/Makefile.msvcproj | 114 ---------------
build/win32/vs9/gtksourceview-gen-srcs.vsprops.in | 35 -----
configure.ac | 17 +--
gtksourceview/Makefile.am | 22 ++--
win32/Makefile-newvs.am | 45 ++++++
{build/win32 => win32}/Makefile.am | 4 +-
{build => win32}/Makefile.msvc-introspection | 64 ++++----
win32/Makefile.msvcproj | 153 ++++++++++++++++++++
{build/win32 => win32}/detectenv-msvc.mak | 0
{build/win32 => win32}/gen-enums.batin | 2 +-
.../gtksourceview-introspection-msvc.mak | 0
{build/win32 => win32}/introspection-msvc.mak | 2 +-
{build/win32 => win32}/replace.py | 0
{build/win32 => win32}/vs10/Makefile.am | 12 +-
.../vs10/gtksourceview-build-defines.props | 2 +-
.../vs10/gtksourceview-gen-srcs.props.in | 12 +-
.../vs10/gtksourceview-install.propsin | 16 +-
.../vs10/gtksourceview-install.vcxproj | 40 ++----
.../vs10/gtksourceview-version-paths.props | 2 +-
{build/win32 => win32}/vs10/gtksourceview.sln | 0
.../vs10/gtksourceview.vcxproj.filtersin | 6 +-
.../win32 => win32}/vs10/gtksourceview.vcxprojin | 84 ++++-------
{build/win32 => win32}/vs11/Makefile.am | 7 +-
{build/win32 => win32}/vs12/Makefile.am | 5 +-
{build/win32 => win32}/vs14/Makefile.am | 5 +-
{build/win32 => win32}/vs9/Makefile.am | 4 +-
.../vs9/gtksourceview-build-defines.vsprops | 2 +-
win32/vs9/gtksourceview-gen-srcs.vsprops.in | 35 +++++
.../vs9/gtksourceview-install.vcproj | 0
.../vs9/gtksourceview-install.vspropsin | 12 +-
.../vs9/gtksourceview-version-paths.vsprops | 4 +-
{build/win32 => win32}/vs9/gtksourceview.sln | 0
{build/win32 => win32}/vs9/gtksourceview.vcprojin | 38 +++---
{build/win32 => win32}/vs9/math.h | 0
37 files changed, 396 insertions(+), 398 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9914e6f..d1ad8b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = gtksourceview po data docs tests testsuite build
+SUBDIRS = gtksourceview po data docs tests testsuite win32
@CODE_COVERAGE_RULES@
diff --git a/configure.ac b/configure.ac
index 8c7c7d4..a1f8fb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,15 +229,14 @@ AC_CONFIG_FILES([
gtksourceview-${GSV_API_VERSION}.pc:gtksourceview.pc.in
Makefile
config.h.win32
-build/Makefile
-build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs9/gtksourceview-gen-srcs.vsprops
-build/win32/vs10/Makefile
-build/win32/vs10/gtksourceview-gen-srcs.props
-build/win32/vs11/Makefile
-build/win32/vs12/Makefile
-build/win32/vs14/Makefile
+win32/Makefile
+win32/vs9/Makefile
+win32/vs9/gtksourceview-gen-srcs.vsprops
+win32/vs10/Makefile
+win32/vs10/gtksourceview-gen-srcs.props
+win32/vs11/Makefile
+win32/vs12/Makefile
+win32/vs14/Makefile
data/Makefile
data/glade/Makefile
data/glade/gtksourceview.xml
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index b3be63a..9dcb31a 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -373,14 +373,14 @@ gtksourceview_HEADERS_INST = \
gtksourceview_HEADERS_EXCLUDES = dummy
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
-$(top_builddir)/build/win32/enums.headers: $(libgtksourceview_public_headers)
- -$(RM) $(top_builddir)/build/win32/enum.headers
+$(top_builddir)/win32/enums.headers: $(libgtksourceview_public_headers)
+ -$(RM) $(top_builddir)/win32/enum.headers
for F in $(libgtksourceview_public_headers); do \
case $$F in \
*.h) \
- echo $$F' ^'>>$(top_builddir)/build/win32/enum.headers \
+ echo $$F' ^'>>$(top_builddir)/win32/enum.headers \
;; \
esac \
done
@@ -388,8 +388,8 @@ $(top_builddir)/build/win32/enums.headers: $(libgtksourceview_public_headers)
# NMake/MSVC introspection
if HAVE_INTROSPECTION
NMAKE_INTROSPECTION_FILES = \
- $(top_builddir)/build/win32/GtkSource-3.0.gir.msvc.introspect \
- $(top_builddir)/build/win32/GtkSource_3_0_gir_list
+ $(top_builddir)/win32/GtkSource-3.0.gir.msvc.introspect \
+ $(top_builddir)/win32/GtkSource_3_0_gir_list
MSVC_INTROSPECT_GIRS = GtkSource-3.0.gir
@@ -405,22 +405,22 @@ GtkSource_3_0_gir_MSVC_INCLUDE_GIRS = Gtk-3.0 Gdk-3.0
GtkSource_3_0_gir_MSVC_PACKAGES = gtk+-3.0 gdk-3.0
GtkSource_3_0_gir_MSVC_EXPORT_PACKAGES = gtksourceview-3.0
GtkSource_3_0_gir_MSVC_LIBS = gtksourceview-3.0
-GtkSource_3_0_gir_MSVC_CFLAGS = -I..\\.. -DGTK_SOURCE_COMPILATION
+GtkSource_3_0_gir_MSVC_CFLAGS = -I.. -DGTK_SOURCE_COMPILATION
GtkSource_3_0_gir_MSVC_SCANNERFLAGS = \
--c-include=gtksourceview/gtksource.h \
--warn-all \
--filelist=GtkSource_3_0_gir_list
-include $(top_srcdir)/build/Makefile.msvc-introspection
+include $(top_srcdir)/win32/Makefile.msvc-introspection
else
NMAKE_INTROSPECTION_FILES =
endif
dist-hook: \
- $(top_builddir)/build/win32/enums.headers \
- $(top_builddir)/build/win32/vs9/gtksourceview.vcproj \
- $(top_builddir)/build/win32/vs9/gtksourceview.headers \
+ $(top_builddir)/win32/enums.headers \
+ $(top_builddir)/win32/vs9/gtksourceview.vcproj \
+ $(top_builddir)/win32/vs9/gtksourceview.headers \
$(NMAKE_INTROSPECTION_FILES)
-include $(top_srcdir)/git.mk
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
new file mode 100644
index 0000000..25feb39
--- /dev/null
+++ b/win32/Makefile-newvs.am
@@ -0,0 +1,45 @@
+# 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, 12 for 2013)
+# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15)
+# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER: Short Version of target Visual Studio (11 for 2012, 12 for 2013, 14 for 2015)
+
+%.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_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 85%
rename from build/win32/Makefile.am
rename to win32/Makefile.am
index 26013a5..a29dce3 100644
--- a/build/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -16,7 +16,7 @@ introspection.body.mak: GtkSource-3.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
@@ -31,7 +31,7 @@ EXTRA_DIST = \
gen-enums.batin \
$(GENERATED_ITEMS)
-gen-enums.bat: $(top_srcdir)/build/win32/gen-enums.batin enum.headers
+gen-enums.bat: $(top_srcdir)/win32/gen-enums.batin enum.headers
-$(RM) $@
$(CPP) -P - -traditional-cpp <$< >$@
$(RM) enum.headers
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..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/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/gen-enums.batin b/win32/gen-enums.batin
similarity index 98%
rename from build/win32/gen-enums.batin
rename to win32/gen-enums.batin
index 5280e94..04a6513 100644
--- a/build/win32/gen-enums.batin
+++ b/win32/gen-enums.batin
@@ -1,6 +1,6 @@
@echo OFF
-cd ..\..\gtksourceview
+cd ..\gtksourceview
if exist gtksourceview-enumtypes.h del gtksourceview-enumtypes.h
if exist gtksourceview-enumtypes.c del gtksourceview-enumtypes.c
diff --git a/build/win32/gtksourceview-introspection-msvc.mak b/win32/gtksourceview-introspection-msvc.mak
similarity index 100%
rename from build/win32/gtksourceview-introspection-msvc.mak
rename to win32/gtksourceview-introspection-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/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/Makefile.am b/win32/vs10/Makefile.am
similarity index 56%
rename from build/win32/vs10/Makefile.am
rename to win32/vs10/Makefile.am
index 93cc36d..e69a3ec 100644
--- a/build/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -18,14 +18,14 @@ EXTRA_DIST = \
gtksourceview-install.vcxproj \
$(GENERATED_ITEMS)
-gtksourceview-install.props: $(top_srcdir)/build/win32/vs10/gtksourceview-install.propsin
$(MSVC10_HEADERS_LISTS)
- -$(RM) $(top_builddir)/build/win32/vs11/gtksourceview-install.props
- -$(RM) $(top_builddir)/build/win32/vs12/gtksourceview-install.props
- -$(RM) $(top_builddir)/build/win32/vs14/gtksourceview-install.props
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtksourceview-install.propsin >$@
+gtksourceview-install.props: $(top_srcdir)/win32/vs10/gtksourceview-install.propsin $(MSVC10_HEADERS_LISTS)
+ -$(RM) $(top_builddir)/win32/vs11/gtksourceview-install.props
+ -$(RM) $(top_builddir)/win32/vs12/gtksourceview-install.props
+ -$(RM) $(top_builddir)/win32/vs14/gtksourceview-install.props
+ $(CPP) -P - <$(top_srcdir)/win32/vs10/gtksourceview-install.propsin >$@
$(RM) $(MSVC10_HEADERS_LISTS)
-math.h: $(top_srcdir)/build/win32/vs9/math.h
+math.h: $(top_srcdir)/win32/vs9/math.h
cp $< $@
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs10/gtksourceview-build-defines.props b/win32/vs10/gtksourceview-build-defines.props
similarity index 76%
rename from build/win32/vs10/gtksourceview-build-defines.props
rename to win32/vs10/gtksourceview-build-defines.props
index 9448f8e..8863fba 100644
--- a/build/win32/vs10/gtksourceview-build-defines.props
+++ b/win32/vs10/gtksourceview-build-defines.props
@@ -13,7 +13,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..;..\..\..\gtksourceview;.\;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..;..\..\gtksourceview;.\;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(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/gtksourceview-gen-srcs.props.in b/win32/vs10/gtksourceview-gen-srcs.props.in
similarity index 58%
rename from build/win32/vs10/gtksourceview-gen-srcs.props.in
rename to win32/vs10/gtksourceview-gen-srcs.props.in
index a58a67f..5ce74f7 100644
--- a/build/win32/vs10/gtksourceview-gen-srcs.props.in
+++ b/win32/vs10/gtksourceview-gen-srcs.props.in
@@ -4,16 +4,16 @@
<Import Project="gtksourceview-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+ <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH>
<GenerateEnums>cd ..
CALL gen-enums.bat $(GlibEtcInstallRoot)
cd $(SolutionDir)
</GenerateEnums>
- <GenerateRsrcSrc>$(GlibEtcInstallRoot)\bin\glib-compile-resources
--target=..\..\..\gtksourceview\gtksourceview-resources.c --generate-source
--sourcedir=..\..\..\gtksourceview ..\..\..\gtksourceview\gtksourceview.gresource.xml</GenerateRsrcSrc>
- <GenGtksourceVersionH>$(PythonPath)\python.exe ..\replace.py --action=replace-var
--input=..\..\..\gtksourceview\gtksourceversion.h.in --output=..\..\..\gtksourceview\gtksourceversion.h.tmp1
--var=GTK_SOURCE_MAJOR_VERSION --outstring=@GTK_SOURCE_MAJOR_VERSION@
-$(PythonPath)\python.exe ..\replace.py --action=replace-var
--input=..\..\..\gtksourceview\gtksourceversion.h.tmp1
--output=..\..\..\gtksourceview\gtksourceversion.h.tmp2 --var=GTK_SOURCE_MINOR_VERSION
--outstring=@GTK_SOURCE_MINOR_VERSION@
-$(PythonPath)\python.exe ..\replace.py --action=replace-var
--input=..\..\..\gtksourceview\gtksourceversion.h.tmp2 --output=..\..\..\gtksourceview\gtksourceversion.h
--var=GTK_SOURCE_MICRO_VERSION --outstring=@GTK_SOURCE_MICRO_VERSION@
-del ..\..\..\gtksourceview\gtksourceversion.h.tmp1 ..\..\..\gtksourceview\gtksourceversion.h.tmp2
+ <GenerateRsrcSrc>$(GlibEtcInstallRoot)\bin\glib-compile-resources
--target=..\..\gtksourceview\gtksourceview-resources.c --generate-source --sourcedir=..\..\gtksourceview
..\..\gtksourceview\gtksourceview.gresource.xml</GenerateRsrcSrc>
+ <GenGtksourceVersionH>$(PythonPath)\python.exe ..\replace.py --action=replace-var
--input=..\..\gtksourceview\gtksourceversion.h.in --output=..\..\gtksourceview\gtksourceversion.h.tmp1
--var=GTK_SOURCE_MAJOR_VERSION --outstring=@GTK_SOURCE_MAJOR_VERSION@
+$(PythonPath)\python.exe ..\replace.py --action=replace-var
--input=..\..\gtksourceview\gtksourceversion.h.tmp1 --output=..\..\gtksourceview\gtksourceversion.h.tmp2
--var=GTK_SOURCE_MINOR_VERSION --outstring=@GTK_SOURCE_MINOR_VERSION@
+$(PythonPath)\python.exe ..\replace.py --action=replace-var
--input=..\..\gtksourceview\gtksourceversion.h.tmp2 --output=..\..\gtksourceview\gtksourceversion.h
--var=GTK_SOURCE_MICRO_VERSION --outstring=@GTK_SOURCE_MICRO_VERSION@
+del ..\..\gtksourceview\gtksourceversion.h.tmp1 ..\..\gtksourceview\gtksourceversion.h.tmp2
</GenGtksourceVersionH>
</PropertyGroup>
<PropertyGroup>
diff --git a/build/win32/vs10/gtksourceview-install.propsin b/win32/vs10/gtksourceview-install.propsin
similarity index 63%
rename from build/win32/vs10/gtksourceview-install.propsin
rename to win32/vs10/gtksourceview-install.propsin
index fcd7c65..68a399d 100644
--- a/build/win32/vs10/gtksourceview-install.propsin
+++ b/win32/vs10/gtksourceview-install.propsin
@@ -12,21 +12,21 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\$(GtkSourceviewDllPrefix)gtk
mkdir $(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words
#include "gtksourceview.vs10.headers"
-copy ..\..\..\gtksourceview\completion-providers\words\gtksourcecompletionwords.h
$(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words
+copy ..\..\gtksourceview\completion-providers\words\gtksourcecompletionwords.h
$(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words
mkdir $(CopyDir)\lib
copy $(SolutionDir)$(Configuration)\$(Platform)\bin\gtksourceview-$(ApiVersion).lib $(CopyDir)\lib
mkdir $(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs
-copy ..\..\..\data\language-specs\*.lang $(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs
-copy ..\..\..\data\language-specs\*.rng $(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs
-copy ..\..\..\data\language-specs\check-language.sh
$(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs
-copy ..\..\..\data\language-specs\language.dtd $(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs
+copy ..\..\data\language-specs\*.lang $(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs
+copy ..\..\data\language-specs\*.rng $(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs
+copy ..\..\data\language-specs\check-language.sh $(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs
+copy ..\..\data\language-specs\language.dtd $(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs
mkdir $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles
-copy ..\..\..\data\styles\*.xml $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles
-copy ..\..\..\data\styles\styles.rng $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles
-copy ..\..\..\data\styles\check-style.sh $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles
+copy ..\..\data\styles\*.xml $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles
+copy ..\..\data\styles\styles.rng $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles
+copy ..\..\data\styles\check-style.sh $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles
</GtkSourceviewDoInstall>
</PropertyGroup>
<PropertyGroup>
diff --git a/build/win32/vs10/gtksourceview-install.vcxproj b/win32/vs10/gtksourceview-install.vcxproj
similarity index 63%
rename from build/win32/vs10/gtksourceview-install.vcxproj
rename to win32/vs10/gtksourceview-install.vcxproj
index 45d1dfd..9d1dd00 100644
--- a/build/win32/vs10/gtksourceview-install.vcxproj
+++ b/win32/vs10/gtksourceview-install.vcxproj
@@ -67,22 +67,14 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir>
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
+ <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir>
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="gtksourceview.vcxproj">
@@ -91,19 +83,13 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying build results...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkSourceviewDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\blah;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying build results...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkSourceviewDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\blah;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying build results...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkSourceviewDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\blah;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying build results...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkSourceviewDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\blah;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\config.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug'">Copying build results...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GtkSourceviewDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\blah;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Copying build results...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GtkSourceviewDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\blah;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/build/win32/vs10/gtksourceview-version-paths.props b/win32/vs10/gtksourceview-version-paths.props
similarity index 96%
rename from build/win32/vs10/gtksourceview-version-paths.props
rename to win32/vs10/gtksourceview-version-paths.props
index 0a0486a..57ef980 100644
--- a/build/win32/vs10/gtksourceview-version-paths.props
+++ b/win32/vs10/gtksourceview-version-paths.props
@@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup Label="UserMacros">
<VSVer>10</VSVer>
- <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
<ApiVersion>3.0</ApiVersion>
diff --git a/build/win32/vs10/gtksourceview.sln b/win32/vs10/gtksourceview.sln
similarity index 100%
rename from build/win32/vs10/gtksourceview.sln
rename to win32/vs10/gtksourceview.sln
diff --git a/build/win32/vs10/gtksourceview.vcxproj.filtersin b/win32/vs10/gtksourceview.vcxproj.filtersin
similarity index 74%
rename from build/win32/vs10/gtksourceview.vcxproj.filtersin
rename to win32/vs10/gtksourceview.vcxproj.filtersin
index 88d250e..c257e61 100644
--- a/build/win32/vs10/gtksourceview.vcxproj.filtersin
+++ b/win32/vs10/gtksourceview.vcxproj.filtersin
@@ -18,9 +18,9 @@
#include "gtksourceview.vs10.sourcefiles.filters"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
<CustomBuild Include="..\gen-enums.bat"><Filter>Resource Files</Filter></CustomBuild>
- <CustomBuild Include="..\..\..\gtksourceview\gtksourceview.gresource.xml"><Filter>Resource
Files</Filter></CustomBuild>
- <CustomBuild Include="..\..\..\gtksourceview\gtksourceversion.h.in"><Filter>Resource
Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\gtksourceview\gtksourceview.gresource.xml"><Filter>Resource
Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\gtksourceview\gtksourceversion.h.in"><Filter>Resource
Files</Filter></CustomBuild>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gtksourceview.vcxprojin b/win32/vs10/gtksourceview.vcxprojin
similarity index 58%
rename from build/win32/vs10/gtksourceview.vcxprojin
rename to win32/vs10/gtksourceview.vcxprojin
index 077e12f..9824775 100644
--- a/build/win32/vs10/gtksourceview.vcxprojin
+++ b/win32/vs10/gtksourceview.vcxprojin
@@ -67,10 +67,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'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -170,61 +168,37 @@
#include "gtksourceview.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="..\..\..\gtksourceview\gtksourceversion.h.in">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating
gtksourceversion.h...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGtksourceVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtksourceview\gtksourceversion.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating
gtksourceversion.h...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGtksourceVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtksourceview\gtksourceversion.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating
gtksourceversion.h...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGtksourceVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtksourceview\gtksourceversion.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating
gtksourceversion.h...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGtksourceVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtksourceview\gtksourceversion.h;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\gtksourceview\gtksourceversion.h.in">
+ <Message Condition="'$(Configuration)'=='Debug'">Generating gtksourceversion.h...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenGtksourceVersionH)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Debug'">..\..\gtksourceview\gtksourceversion.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Generating gtksourceversion.h...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenGtksourceVersionH)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Release'">..\..\gtksourceview\gtksourceversion.h;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\gen-enums.bat">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Enumeration
sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Enumeration
sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Enumeration
sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Enumeration
sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Debug'">Generating Enumeration sources...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenerateEnums)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Debug'">..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Generating Enumeration sources...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenerateEnums)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Release'">..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\..\..\gtksourceview\gtksourceview.gresource.xml">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating GResource
sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateRsrcSrc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtksourceview\gtksourceview-resources.c;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating GResource
sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateRsrcSrc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtksourceview\gtksourceview-resources.c;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating GResource
sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateRsrcSrc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtksourceview\gtksourceview-resources.c;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GResource
sources...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateRsrcSrc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtksourceview\gtksourceview-resources.c;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\gtksourceview\gtksourceview.gresource.xml">
+ <Message Condition="'$(Configuration)'=='Debug'">Generating GResource sources...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenerateRsrcSrc)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Debug'">..\..\gtksourceview\gtksourceview-resources.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Generating GResource sources...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenerateRsrcSrc)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Release'">..\..\gtksourceview\gtksourceview-resources.c;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
similarity index 75%
rename from build/win32/vs11/Makefile.am
rename to win32/vs11/Makefile.am
index a97c432..99b50b4 100644
--- a/build/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -9,15 +9,16 @@ EXTRA_DIST = \
gtksourceview-install.vcxproj \
math.h
-math.h: $(top_srcdir)/build/win32/vs9/math.h
+math.h: $(top_srcdir)/win32/vs9/math.h
cp $< $@
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
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
similarity index 80%
rename from build/win32/vs12/Makefile.am
rename to win32/vs12/Makefile.am
index d383ca2..8c8f7a0 100644
--- a/build/win32/vs12/Makefile.am
+++ b/win32/vs12/Makefile.am
@@ -10,10 +10,11 @@ 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
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
similarity index 80%
rename from build/win32/vs14/Makefile.am
rename to win32/vs14/Makefile.am
index b692e60..eb448d5 100644
--- a/build/win32/vs14/Makefile.am
+++ b/win32/vs14/Makefile.am
@@ -10,10 +10,11 @@ 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
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
similarity index 72%
rename from build/win32/vs9/Makefile.am
rename to win32/vs9/Makefile.am
index 8c98ffa..f499ecf 100644
--- a/build/win32/vs9/Makefile.am
+++ b/win32/vs9/Makefile.am
@@ -16,8 +16,8 @@ EXTRA_DIST = \
$(GENERATED_ITEMS) \
math.h
-gtksourceview-install.vsprops: $(top_srcdir)/build/win32/vs9/gtksourceview-install.vspropsin
$(MSVC_HEADERS_LISTS)
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtksourceview-install.vspropsin >$@
+gtksourceview-install.vsprops: $(top_srcdir)/win32/vs9/gtksourceview-install.vspropsin $(MSVC_HEADERS_LISTS)
+ $(CPP) -P - <$(top_srcdir)/win32/vs9/gtksourceview-install.vspropsin >$@
$(RM) $(MSVC_HEADERS_LISTS)
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs9/gtksourceview-build-defines.vsprops
b/win32/vs9/gtksourceview-build-defines.vsprops
similarity index 69%
rename from build/win32/vs9/gtksourceview-build-defines.vsprops
rename to win32/vs9/gtksourceview-build-defines.vsprops
index 1b88672..2352daf 100644
--- a/build/win32/vs9/gtksourceview-build-defines.vsprops
+++ b/win32/vs9/gtksourceview-build-defines.vsprops
@@ -9,7 +9,7 @@
>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..;..\..\..\gtksourceview;.\;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include"
+
AdditionalIncludeDirectories="..\..;..\..\gtksourceview;.\;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(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/win32/vs9/gtksourceview-gen-srcs.vsprops.in b/win32/vs9/gtksourceview-gen-srcs.vsprops.in
new file mode 100644
index 0000000..b2f5bdf
--- /dev/null
+++ b/win32/vs9/gtksourceview-gen-srcs.vsprops.in
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gtksourceviewgensrcsprops"
+ InheritedPropertySheets=".\gtksourceview-build-defines.vsprops"
+ >
+ <UserMacro
+ Name="CopyConfigH"
+ Value="copy ..\..\config.h.win32 ..\..\config.h"
+ />
+ <UserMacro
+ Name="GenerateEnums"
+ Value="
+cd ..

+CALL gen-enums.bat $(GlibEtcInstallRoot)

+cd $(SolutionDir)

+ "
+ />
+ <UserMacro
+ Name="GenerateRsrcSrc"
+ Value="
+$(GlibEtcInstallRoot)\bin\glib-compile-resources --target=..\..\gtksourceview\gtksourceview-resources.c
--generate-source --sourcedir=..\..\gtksourceview ..\..\gtksourceview\gtksourceview.gresource.xml

+ "
+ />
+ <UserMacro
+ Name="GenGtksourceVersionH"
+ Value="
+$(PythonPath)\python.exe ..\replace.py --action=replace-var
--input=..\..\gtksourceview\gtksourceversion.h.in --output=..\..\gtksourceview\gtksourceversion.h.tmp1
--var=GTK_SOURCE_MAJOR_VERSION --outstring=@GTK_SOURCE_MAJOR_VERSION@

+$(PythonPath)\python.exe ..\replace.py --action=replace-var
--input=..\..\gtksourceview\gtksourceversion.h.tmp1 --output=..\..\gtksourceview\gtksourceversion.h.tmp2
--var=GTK_SOURCE_MINOR_VERSION --outstring=@GTK_SOURCE_MINOR_VERSION@

+$(PythonPath)\python.exe ..\replace.py --action=replace-var
--input=..\..\gtksourceview\gtksourceversion.h.tmp2 --output=..\..\gtksourceview\gtksourceversion.h
--var=GTK_SOURCE_MICRO_VERSION --outstring=@GTK_SOURCE_MICRO_VERSION@

+del ..\..\gtksourceview\gtksourceversion.h.tmp1 ..\..\gtksourceview\gtksourceversion.h.tmp2

+ "
+ />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtksourceview-install.vcproj b/win32/vs9/gtksourceview-install.vcproj
similarity index 100%
rename from build/win32/vs9/gtksourceview-install.vcproj
rename to win32/vs9/gtksourceview-install.vcproj
diff --git a/build/win32/vs9/gtksourceview-install.vspropsin b/win32/vs9/gtksourceview-install.vspropsin
similarity index 60%
rename from build/win32/vs9/gtksourceview-install.vspropsin
rename to win32/vs9/gtksourceview-install.vspropsin
index 1c489bb..c81f1b6 100644
--- a/build/win32/vs9/gtksourceview-install.vspropsin
+++ b/win32/vs9/gtksourceview-install.vspropsin
@@ -15,19 +15,19 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GtkSourceviewDllPr
mkdir $(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words

#include "gtksourceview.headers"
-copy ..\..\..\gtksourceview\completion-providers\words\gtksourcecompletionwords.h
$(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words

+copy ..\..\gtksourceview\completion-providers\words\gtksourcecompletionwords.h
$(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words

mkdir $(CopyDir)\lib

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib

mkdir $(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs

-copy ..\..\..\data\language-specs\*.lang
$(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs

-copy ..\..\..\data\language-specs\*.rng
$(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs

-copy ..\..\..\data\language-specs\language.dtd
$(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs

+copy ..\..\data\language-specs\*.lang $(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs

+copy ..\..\data\language-specs\*.rng $(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs

+copy ..\..\data\language-specs\language.dtd
$(CopyDir)\share\gtksourceview-$(ApiVersion)\language-specs

mkdir $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles

-copy ..\..\..\data\styles\*.xml $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles

-copy ..\..\..\data\styles\styles.rng $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles

+copy ..\..\data\styles\*.xml $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles

+copy ..\..\data\styles\styles.rng $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles

"
/>
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtksourceview-version-paths.vsprops
b/win32/vs9/gtksourceview-version-paths.vsprops
similarity index 91%
rename from build/win32/vs9/gtksourceview-version-paths.vsprops
rename to win32/vs9/gtksourceview-version-paths.vsprops
index 8dc97da..6ef884f 100644
--- a/build/win32/vs9/gtksourceview-version-paths.vsprops
+++ b/win32/vs9/gtksourceview-version-paths.vsprops
@@ -14,11 +14,11 @@
/>
<UserMacro
Name="GlibEtcInstallRoot"
- Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ Value="$(SolutionDir)\..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="GlibMkEnumsPath"
- Value="..\..\..\vs$(VSVer)\$(PlatformName)"
+ Value="..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="DefDir"
diff --git a/build/win32/vs9/gtksourceview.sln b/win32/vs9/gtksourceview.sln
similarity index 100%
rename from build/win32/vs9/gtksourceview.sln
rename to win32/vs9/gtksourceview.sln
diff --git a/build/win32/vs9/gtksourceview.vcprojin b/win32/vs9/gtksourceview.vcprojin
similarity index 86%
rename from build/win32/vs9/gtksourceview.vcprojin
rename to win32/vs9/gtksourceview.vcprojin
index 1f2a4f7..2f7f322 100644
--- a/build/win32/vs9/gtksourceview.vcprojin
+++ b/win32/vs9/gtksourceview.vcprojin
@@ -175,44 +175,44 @@
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="..\..\..\gtksourceview\gtksourceversion.h.in"
+ <File RelativePath="..\..\gtksourceview\gtksourceversion.h.in"
>
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating gtksourceversion.h..."
CommandLine="$(GenGtksourceVersionH)"
- Outputs="..\..\..\gtksourceview\gtksourceversion.h"
+ Outputs="..\..\gtksourceview\gtksourceversion.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -220,7 +220,7 @@
Name="VCCustomBuildTool"
Description="Generating gtksourceversion.h..."
CommandLine="$(GenGtksourceVersionH)"
- Outputs="..\..\..\gtksourceview\gtksourceversion.h"
+ Outputs="..\..\gtksourceview\gtksourceversion.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -228,7 +228,7 @@
Name="VCCustomBuildTool"
Description="Generating gtksourceversion.h..."
CommandLine="$(GenGtksourceVersionH)"
- Outputs="..\..\..\gtksourceview\gtksourceversion.h"
+ Outputs="..\..\gtksourceview\gtksourceversion.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -236,7 +236,7 @@
Name="VCCustomBuildTool"
Description="Generating gtksourceversion.h..."
CommandLine="$(GenGtksourceVersionH)"
- Outputs="..\..\..\gtksourceview\gtksourceversion.h"
+ Outputs="..\..\gtksourceview\gtksourceversion.h"
/>
</FileConfiguration>
</File>
@@ -245,39 +245,39 @@
<Tool Name="VCCustomBuildTool"
Description="Generating Enumeration sources..."
CommandLine="$(GenerateEnums)"
-
Outputs="..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h"
+
Outputs="..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VCCustomBuildTool"
Description="Generating Enumeration sources..."
CommandLine="$(GenerateEnums)"
-
Outputs="..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h"
+
Outputs="..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VCCustomBuildTool"
Description="Generating Enumeration sources..."
CommandLine="$(GenerateEnums)"
-
Outputs="..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h"
+
Outputs="..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VCCustomBuildTool"
Description="Generating Enumeration sources..."
CommandLine="$(GenerateEnums)"
-
Outputs="..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h"
+
Outputs="..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h"
/>
</FileConfiguration>
</File>
- <File RelativePath="..\..\..\gtksourceview\gtksourceview.gresource.xml"
+ <File RelativePath="..\..\gtksourceview\gtksourceview.gresource.xml"
>
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating GResource sources..."
CommandLine="$(GenerateRsrcSrc)"
- Outputs="..\..\..\gtksourceview\gtksourceview-resources.c"
+ Outputs="..\..\gtksourceview\gtksourceview-resources.c"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -285,7 +285,7 @@
Name="VCCustomBuildTool"
Description="Generating GResource sources..."
CommandLine="$(GenerateRsrcSrc)"
- Outputs="..\..\..\gtksourceview\gtksourceview-resources.c"
+ Outputs="..\..\gtksourceview\gtksourceview-resources.c"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -293,7 +293,7 @@
Name="VCCustomBuildTool"
Description="Generating GResource sources..."
CommandLine="$(GenerateRsrcSrc)"
- Outputs="..\..\..\gtksourceview\gtksourceview-resources.c"
+ Outputs="..\..\gtksourceview\gtksourceview-resources.c"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -301,7 +301,7 @@
Name="VCCustomBuildTool"
Description="Generating GResource sources..."
CommandLine="$(GenerateRsrcSrc)"
- Outputs="..\..\..\gtksourceview\gtksourceview-resources.c"
+ Outputs="..\..\gtksourceview\gtksourceview-resources.c"
/>
</FileConfiguration>
</File>
diff --git a/build/win32/vs9/math.h b/win32/vs9/math.h
similarity index 100%
rename from build/win32/vs9/math.h
rename to win32/vs9/math.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
