diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | build/Makefile-newvs.am | 45 | ||||
| -rw-r--r-- | build/Makefile.am | 3 | ||||
| -rw-r--r-- | build/Makefile.msvcproj | 114 | ||||
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | pango/Makefile.am | 24 | ||||
| -rw-r--r-- | win32/Makefile-newvs.am | 46 | ||||
| -rw-r--r-- | win32/Makefile.am (renamed from build/win32/Makefile.am) | 2 | ||||
| -rw-r--r-- | win32/Makefile.msvc-introspection (renamed from build/Makefile.msvc-introspection) | 64 | ||||
| -rw-r--r-- | win32/Makefile.msvcproj | 153 | ||||
| -rw-r--r-- | win32/detectenv-msvc.mak (renamed from build/win32/detectenv-msvc.mak) | 0 | ||||
| -rw-r--r-- | win32/introspection-msvc.mak (renamed from build/win32/introspection-msvc.mak) | 0 | ||||
| -rw-r--r-- | win32/pango-introspection-msvc.mak (renamed from build/win32/pango-introspection-msvc.mak) | 0 | ||||
| -rw-r--r-- | win32/pangopc.py (renamed from build/win32/pangopc.py) | 0 | ||||
| -rw-r--r-- | win32/pc_base.py (renamed from build/win32/pc_base.py) | 0 | ||||
| -rw-r--r-- | win32/replace.py (renamed from build/win32/replace.py) | 0 | ||||
| -rw-r--r-- | win32/unistd.h (renamed from build/win32/unistd.h) | 0 | ||||
| -rw-r--r-- | win32/vs10/Makefile.am (renamed from build/win32/vs10/Makefile.am) | 10 | ||||
| -rw-r--r-- | win32/vs10/README.txt (renamed from build/win32/vs10/README.txt) | 4 | ||||
| -rw-r--r-- | win32/vs10/pango-build-defines.props (renamed from build/win32/vs10/pango-build-defines.props) | 2 | ||||
| -rw-r--r-- | win32/vs10/pango-ignore-fc.props (renamed from build/win32/vs10/pango-ignore-fc.props) | 0 | ||||
| -rw-r--r-- | win32/vs10/pango-install-bin.props (renamed from build/win32/vs10/pango-install-bin.props) | 0 | ||||
| -rw-r--r-- | win32/vs10/pango-install.propsin (renamed from build/win32/vs10/pango-install.propsin) | 10 | ||||
| -rw-r--r-- | win32/vs10/pango-install.vcxproj (renamed from build/win32/vs10/pango-install.vcxproj) | 74 | ||||
| -rw-r--r-- | win32/vs10/pango-install.vcxproj.filters (renamed from build/win32/vs10/pango-install.vcxproj.filters) | 2 | ||||
| -rw-r--r-- | win32/vs10/pango-prebuild.props (renamed from build/win32/vs10/pango-prebuild.props) | 2 | ||||
| -rw-r--r-- | win32/vs10/pango-version-paths.props.in (renamed from build/win32/vs10/pango-version-paths.props.in) | 4 | ||||
| -rw-r--r-- | win32/vs10/pango.sln (renamed from build/win32/vs10/pango.sln) | 0 | ||||
| -rw-r--r-- | win32/vs10/pango.vcxproj.filtersin (renamed from build/win32/vs10/pango.vcxproj.filtersin) | 8 | ||||
| -rw-r--r-- | win32/vs10/pango.vcxprojin (renamed from build/win32/vs10/pango.vcxprojin) | 32 | ||||
| -rw-r--r-- | win32/vs10/pangocairo.vcxproj.filtersin (renamed from build/win32/vs10/pangocairo.vcxproj.filtersin) | 10 | ||||
| -rw-r--r-- | win32/vs10/pangocairo.vcxprojin (renamed from build/win32/vs10/pangocairo.vcxprojin) | 34 | ||||
| -rw-r--r-- | win32/vs10/pangoft2.vcxproj.filtersin (renamed from build/win32/vs10/pangoft2.vcxproj.filtersin) | 2 | ||||
| -rw-r--r-- | win32/vs10/pangoft2.vcxprojin (renamed from build/win32/vs10/pangoft2.vcxprojin) | 2 | ||||
| -rw-r--r-- | win32/vs10/pangowin32.vcxproj.filtersin (renamed from build/win32/vs10/pangowin32.vcxproj.filtersin) | 2 | ||||
| -rw-r--r-- | win32/vs10/pangowin32.vcxprojin (renamed from build/win32/vs10/pangowin32.vcxprojin) | 2 | ||||
| -rw-r--r-- | win32/vs11/Makefile.am (renamed from build/win32/vs11/Makefile.am) | 4 | ||||
| -rw-r--r-- | win32/vs12/Makefile.am (renamed from build/win32/vs12/Makefile.am) | 4 | ||||
| -rw-r--r-- | win32/vs14/Makefile.am (renamed from build/win32/vs14/Makefile.am) | 4 | ||||
| -rw-r--r-- | win32/vs9/Makefile.am (renamed from build/win32/vs9/Makefile.am) | 4 | ||||
| -rw-r--r-- | win32/vs9/README.txt (renamed from build/win32/vs9/README.txt) | 4 | ||||
| -rw-r--r-- | win32/vs9/pango-build-defines.vsprops (renamed from build/win32/vs9/pango-build-defines.vsprops) | 2 | ||||
| -rw-r--r-- | win32/vs9/pango-ignore-fc.vsprops (renamed from build/win32/vs9/pango-ignore-fc.vsprops) | 0 | ||||
| -rw-r--r-- | win32/vs9/pango-install-bin.vsprops (renamed from build/win32/vs9/pango-install-bin.vsprops) | 0 | ||||
| -rw-r--r-- | win32/vs9/pango-install.vcproj (renamed from build/win32/vs9/pango-install.vcproj) | 0 | ||||
| -rw-r--r-- | win32/vs9/pango-install.vspropsin (renamed from build/win32/vs9/pango-install.vspropsin) | 10 | ||||
| -rw-r--r-- | win32/vs9/pango-prebuild.vsprops (renamed from build/win32/vs9/pango-prebuild.vsprops) | 2 | ||||
| -rw-r--r-- | win32/vs9/pango-version-paths.vsprops.in (renamed from build/win32/vs9/pango-version-paths.vsprops.in) | 4 | ||||
| -rw-r--r-- | win32/vs9/pango.sln (renamed from build/win32/vs9/pango.sln) | 0 | ||||
| -rw-r--r-- | win32/vs9/pango.vcprojin (renamed from build/win32/vs9/pango.vcprojin) | 16 | ||||
| -rw-r--r-- | win32/vs9/pangocairo.vcprojin (renamed from build/win32/vs9/pangocairo.vcprojin) | 10 | ||||
| -rw-r--r-- | win32/vs9/pangoft2.vcprojin (renamed from build/win32/vs9/pangoft2.vcprojin) | 2 | ||||
| -rw-r--r-- | win32/vs9/pangowin32.vcprojin (renamed from build/win32/vs9/pangowin32.vcprojin) | 2 | ||||
| -rw-r--r-- | win32/vs9/stdint.h (renamed from build/win32/vs9/stdint.h) | 0 |
54 files changed, 370 insertions, 368 deletions
diff --git a/Makefile.am b/Makefile.am index 4bae8dbf..9e31b34e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in. -SUBDIRS= pango pango-view examples docs tools tests build +SUBDIRS= pango pango-view examples docs tools tests win32 EXTRA_DIST = \ autogen.sh \ diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am deleted file mode 100644 index b5e32160..00000000 --- a/build/Makefile-newvs.am +++ /dev/null @@ -1,45 +0,0 @@ -# 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, and is copied into -# $(srcroot)/build/. - -# Author: Fan, Chun-wei -# November 05, 2012 - -# 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)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - -%.txt: - sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - -%.vcxproj: - if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi - -%.props: $(top_builddir)/build/win32/vs10/Makefile - if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi - -%.vcxproj.filters: - if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi diff --git a/build/Makefile.am b/build/Makefile.am deleted file mode 100644 index 73e7a6f6..00000000 --- a/build/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = win32 - --include $(top_srcdir)/git.mk diff --git a/build/Makefile.msvcproj b/build/Makefile.msvcproj deleted file mode 100644 index f127eea5..00000000 --- a/build/Makefile.msvcproj +++ /dev/null @@ -1,114 +0,0 @@ -# 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, and is copied into -# $(srcroot)/build/. - -# * 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)/build/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 -# 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)/build/win32/vs9/YourProject.vcproj \ -# $(top_builddir)/build/win32/vs9/YourProject.headers - - -# 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)/build/win32/vs10/$(1).vcxproj: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj - -$(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile - -$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj - -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj - -$(RM) $(top_builddir)/build/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)/build/win32/vs9/$(1).vcprojin >$(top_builddir)/build/win32/vs9/$(1).vcproj - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxprojin >$(top_builddir)/build/win32/vs10/$(1).vcxproj - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters - $(RM) $(1).sourcefiles - $(RM) $(1).vs10.sourcefiles - $(RM) $(1).vs10.sourcefiles.filters - -$(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers - -$(top_builddir)/build/win32/vs9/$(1).headers: Makefile - -$(RM) $(top_builddir)/build/win32/vs9/$(1).headers - -$(RM) $(top_builddir)/build/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)/build/win32/vs9/$(1).headers && \ - echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/build/win32/vs10/$(1).vs10.headers \ - ;; \ - esac; \ - done - -endef - -$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff --git a/configure.ac b/configure.ac index fc6cc6b6..ed1a0053 100644 --- a/configure.ac +++ b/configure.ac @@ -645,15 +645,14 @@ docs/Makefile docs/version.xml tools/Makefile tests/Makefile -build/Makefile -build/win32/Makefile -build/win32/vs9/Makefile -build/win32/vs9/pango-version-paths.vsprops -build/win32/vs10/Makefile -build/win32/vs10/pango-version-paths.props -build/win32/vs11/Makefile -build/win32/vs12/Makefile -build/win32/vs14/Makefile +win32/Makefile +win32/vs9/Makefile +win32/vs9/pango-version-paths.vsprops +win32/vs10/Makefile +win32/vs10/pango-version-paths.props +win32/vs11/Makefile +win32/vs12/Makefile +win32/vs14/Makefile pango.pc pangowin32.pc pangoft2.pc diff --git a/pango/Makefile.am b/pango/Makefile.am index 4fddcaab..6df7d52c 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -490,7 +490,7 @@ pangoft2_EXCLUDES = dummy pangocairo_FILES = $(pangocairo_core_sources) pangocairo_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj if HAVE_INTROSPECTION # Introspection Items for MSVC @@ -502,17 +502,17 @@ BASE_MSVC_GIR_CFLAGS = \ -DPANGO_ENABLE_ENGINE INTROSPECTION_INTERMEDIATE_ITEMS = \ - $(top_builddir)/build/win32/Pango-1.0.gir.msvc.introspect \ - $(top_builddir)/build/win32/Pango_1_0_gir_list \ - $(top_builddir)/build/win32/PangoCairo-1.0.gir.msvc.introspect \ - $(top_builddir)/build/win32/PangoCairo_1_0_gir_list + $(top_builddir)/win32/Pango-1.0.gir.msvc.introspect \ + $(top_builddir)/win32/Pango_1_0_gir_list \ + $(top_builddir)/win32/PangoCairo-1.0.gir.msvc.introspect \ + $(top_builddir)/win32/PangoCairo_1_0_gir_list Pango_1_0_gir_MSVC_FILES = $(Pango_1_0_gir_FILES) Pango_1_0_gir_MSVC_PACKAGES = gobject-2.0 cairo glib-2.0 Pango_1_0_gir_MSVC_EXPORT_PACKAGES = $(Pango_1_0_gir_EXPORT_PACKAGES) Pango_1_0_gir_MSVC_INCLUDE_GIRS = $(Pango_1_0_gir_INCLUDES) Pango_1_0_gir_MSVC_LIBS = pango-1.0 -Pango_1_0_gir_MSVC_CFLAGS = -I../.. $(BASE_MSVC_GIR_CFLAGS) +Pango_1_0_gir_MSVC_CFLAGS = -I.. $(BASE_MSVC_GIR_CFLAGS) Pango_1_0_gir_MSVC_SCANNERFLAGS = $(Pango_1_0_gir_SCANNERFLAGS) pangocairo_msvc_introspection_files = \ @@ -531,17 +531,17 @@ PangoCairo_1_0_gir_MSVC_LIBS = $(Pango_1_0_gir_MSVC_LIBS) pangocairo-1.0 PangoCairo_1_0_gir_MSVC_CFLAGS = $(Pango_1_0_gir_MSVC_CFLAGS) PangoCairo_1_0_gir_MSVC_SCANNERFLAGS = --include-uninstalled=./Pango-1.0.gir --c-include "pango/pangocairo.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/pango.vcproj \ - $(top_builddir)/build/win32/vs9/pangowin32.vcproj \ - $(top_builddir)/build/win32/vs9/pangoft2.vcproj \ - $(top_builddir)/build/win32/vs9/pangocairo.vcproj \ - $(top_builddir)/build/win32/vs9/pango.headers \ + $(top_builddir)/win32/vs9/pango.vcproj \ + $(top_builddir)/win32/vs9/pangowin32.vcproj \ + $(top_builddir)/win32/vs9/pangoft2.vcproj \ + $(top_builddir)/win32/vs9/pangocairo.vcproj \ + $(top_builddir)/win32/vs9/pango.headers \ $(INTROSPECTION_INTERMEDIATE_ITEMS) -include $(top_srcdir)/git.mk diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am new file mode 100644 index 00000000..ecdf3b55 --- /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 index 90b9c093..9efb9c63 100644 --- a/build/win32/Makefile.am +++ b/win32/Makefile.am @@ -10,7 +10,7 @@ introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES) -$(RM) introspection.body.mak for F in `ls *.msvc.introspect`; do \ case $$F in \ - *) cat $(top_builddir)/build/win32/$$F >>introspection.body.mak \ + *) cat $(top_builddir)/win32/$$F >>introspection.body.mak \ ;; \ esac; \ done diff --git a/build/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection index 6c909643..28e8b50b 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 $(srcroot)/win32 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 <this 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 00000000..2e96e12b --- /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 index 61f979d4..61f979d4 100644 --- a/build/win32/detectenv-msvc.mak +++ b/win32/detectenv-msvc.mak diff --git a/build/win32/introspection-msvc.mak b/win32/introspection-msvc.mak index 87398442..87398442 100644 --- a/build/win32/introspection-msvc.mak +++ b/win32/introspection-msvc.mak diff --git a/build/win32/pango-introspection-msvc.mak b/win32/pango-introspection-msvc.mak index b2961a76..b2961a76 100644 --- a/build/win32/pango-introspection-msvc.mak +++ b/win32/pango-introspection-msvc.mak diff --git a/build/win32/pangopc.py b/win32/pangopc.py index 14eac3f3..14eac3f3 100644 --- a/build/win32/pangopc.py +++ b/win32/pangopc.py diff --git a/build/win32/pc_base.py b/win32/pc_base.py index 587ba83d..587ba83d 100644 --- a/build/win32/pc_base.py +++ b/win32/pc_base.py diff --git a/build/win32/replace.py b/win32/replace.py index a81bab94..a81bab94 100644 --- a/build/win32/replace.py +++ b/win32/replace.py diff --git a/build/win32/unistd.h b/win32/unistd.h index 8655b1d5..8655b1d5 100644 --- a/build/win32/unistd.h +++ b/win32/unistd.h diff --git a/build/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index ba3e8d58..e8cbc363 100644 --- a/build/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -30,11 +30,11 @@ EXTRA_DIST = \ README.txt \ $(GENERATED_ITEMS) -pango-install.props: $(top_srcdir)/build/win32/vs10/pango-install.propsin pango.vs10.headers - -$(RM) $(top_builddir)/build/win32/vs11/pango-install.props - -$(RM) $(top_builddir)/build/win32/vs12/pango-install.props - -$(RM) $(top_builddir)/build/win32/vs14/pango-install.props - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pango-install.propsin >$@ +pango-install.props: $(top_srcdir)/win32/vs10/pango-install.propsin pango.vs10.headers + -$(RM) $(top_builddir)/win32/vs11/pango-install.props + -$(RM) $(top_builddir)/win32/vs12/pango-install.props + -$(RM) $(top_builddir)/win32/vs14/pango-install.props + $(CPP) -P - <$(top_srcdir)/win32/vs10/pango-install.propsin >$@ rm pango.vs10.headers DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/vs10/README.txt b/win32/vs10/README.txt index f2a2324b..2f1be96c 100644 --- a/build/win32/vs10/README.txt +++ b/win32/vs10/README.txt @@ -34,7 +34,7 @@ caused by mixing calls to different CRTs can be kept at a minimum. zlib, libpng, and Cairo do contain support for compiling under VS10
using VS project files and/or makefiles at this time of writing.
For GLib, VS10 project files are available under
-$(srcroot)\build\vs10 in the case of GLib (stable/unstable).
+$(srcroot)\vs10 in the case of GLib (stable/unstable).
There is no known official VS10 build support for fontconfig
(along with freetype and expat which will work with the pre-compiled
@@ -73,7 +73,7 @@ Use the *_fc configs if the usage of fontconfig is desired; otherwise use the configs that do not end with _fc.
*this* file you are now reading is thus located at
-<root>\<this-pango-source-tree>\build\win32\vs10\README.txt.
+<root>\<this-pango-source-tree>\win32\vs10\README.txt.
<PlatformName> is either Win32 or x64, as in VS10 project files.
diff --git a/build/win32/vs10/pango-build-defines.props b/win32/vs10/pango-build-defines.props index f8cc5a4a..bb15936d 100644 --- a/build/win32/vs10/pango-build-defines.props +++ b/win32/vs10/pango-build-defines.props @@ -19,7 +19,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>..\..\..;..\..\..\pango;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..;..\..\pango;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2;%(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/pango-ignore-fc.props b/win32/vs10/pango-ignore-fc.props index fef038dc..fef038dc 100644 --- a/build/win32/vs10/pango-ignore-fc.props +++ b/win32/vs10/pango-ignore-fc.props diff --git a/build/win32/vs10/pango-install-bin.props b/win32/vs10/pango-install-bin.props index aad3ca57..aad3ca57 100644 --- a/build/win32/vs10/pango-install-bin.props +++ b/win32/vs10/pango-install-bin.props diff --git a/build/win32/vs10/pango-install.propsin b/win32/vs10/pango-install.propsin index efac8945..5fbe5dad 100644 --- a/build/win32/vs10/pango-install.propsin +++ b/win32/vs10/pango-install.propsin @@ -16,11 +16,11 @@ if exist ..\pangocairo.pc copy ..\pangocairo.pc $(CopyDir)\lib\pkgconfig if "$(Configuration)" == "Release" goto END if "$(Configuration)" == "Debug" goto END -copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(ApiVersion)\pango -copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(ApiVersion)\pango -copy ..\..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(ApiVersion)\pango -copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(ApiVersion)\pango -copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(ApiVersion)\pango +copy ..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(ApiVersion)\pango +copy ..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(ApiVersion)\pango +copy ..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(ApiVersion)\pango +copy ..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(ApiVersion)\pango +copy ..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(ApiVersion)\pango if exist ..\pangoft2.pc copy ..\pangoft2.pc $(CopyDir)\lib\pkgconfig :END diff --git a/build/win32/vs10/pango-install.vcxproj b/win32/vs10/pango-install.vcxproj index 28ac16e9..cce1b88b 100644 --- a/build/win32/vs10/pango-install.vcxproj +++ b/win32/vs10/pango-install.vcxproj @@ -121,22 +121,14 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">$(GlibEtcInstallRoot)\</OutDir> - <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir> - <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">$(GlibEtcInstallRoot)\</OutDir> - <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir> - <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">$(GlibEtcInstallRoot)\</OutDir> - <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir> - <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">$(GlibEtcInstallRoot)\</OutDir> - <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'" /> - <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)'=='Debug_FC'">$(GlibEtcInstallRoot)\</OutDir> + <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug_FC'" /> + <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir> + <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" /> + <OutDir Condition="'$(Configuration)'=='Release_FC'">$(GlibEtcInstallRoot)\</OutDir> + <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release_FC'" /> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'"> </ItemDefinitionGroup> @@ -155,39 +147,23 @@ <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'">$(PangoPCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">blah;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">$(PangoPCFiles);$(PangoFT2PCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">blah;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PangoPCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">blah;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">$(PangoPCFiles);$(PangoFT2PCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">blah;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PangoPCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">blah;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">$(PangoPCFiles);$(PangoFT2PCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">blah;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PangoPCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">blah;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">$(PangoPCFiles);$(PangoFT2PCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">blah;%(Outputs)</Outputs> + <CustomBuild Include="..\..\config.h.win32"> + <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message> + <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(PangoPCFiles)</AdditionalInputs> + <Command Condition="'$(Configuration)'=='Debug'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Debug_FC'">Installing Build Results...</Message> + <AdditionalInputs Condition="'$(Configuration)'=='Debug_FC'">$(PangoPCFiles);$(PangoFT2PCFiles)</AdditionalInputs> + <Command Condition="'$(Configuration)'=='Debug_FC'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)'=='Debug_FC'">blah;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message> + <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(PangoPCFiles)</AdditionalInputs> + <Command Condition="'$(Configuration)'=='Release'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release_FC'">Installing Build Results...</Message> + <AdditionalInputs Condition="'$(Configuration)'=='Release_FC'">$(PangoPCFiles);$(PangoFT2PCFiles)</AdditionalInputs> + <Command Condition="'$(Configuration)'=='Release_FC'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)'=='Release_FC'">blah;%(Outputs)</Outputs> </CustomBuild> <CustomBuild Include="..\pangopc.py"> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message> diff --git a/build/win32/vs10/pango-install.vcxproj.filters b/win32/vs10/pango-install.vcxproj.filters index 9a12c756..88fd7b76 100644 --- a/build/win32/vs10/pango-install.vcxproj.filters +++ b/win32/vs10/pango-install.vcxproj.filters @@ -8,6 +8,6 @@ </ItemGroup> <ItemGroup> <CustomBuild Include="..\pangopc.py"><Filter>Resource Files</Filter></CustomBuild> - <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> </ItemGroup> </Project> diff --git a/build/win32/vs10/pango-prebuild.props b/win32/vs10/pango-prebuild.props index 0cedea48..f7a441de 100644 --- a/build/win32/vs10/pango-prebuild.props +++ b/win32/vs10/pango-prebuild.props @@ -4,7 +4,7 @@ <Import Project="pango-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros"> - <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH> + <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>pangoprebuildprops</_PropertySheetDisplayName> diff --git a/build/win32/vs10/pango-version-paths.props.in b/win32/vs10/pango-version-paths.props.in index 4c4a9ff1..6ba33a1a 100644 --- a/build/win32/vs10/pango-version-paths.props.in +++ b/win32/vs10/pango-version-paths.props.in @@ -6,7 +6,7 @@ <PangoMinorVersion>@PANGO_VERSION_MINOR@</PangoMinorVersion> <PangoMicroVersion>@PANGO_VERSION_MICRO@</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> - <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> + <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> <PangoLibtoolCompatibleDllPrefix>lib</PangoLibtoolCompatibleDllPrefix> <PangoLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</PangoLibtoolCompatibleDllSuffix> @@ -67,4 +67,4 @@ <Value>$(PythonPathX64)</Value> </BuildMacro> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/pango.sln b/win32/vs10/pango.sln index e80e3fcf..e80e3fcf 100644 --- a/build/win32/vs10/pango.sln +++ b/win32/vs10/pango.sln diff --git a/build/win32/vs10/pango.vcxproj.filtersin b/win32/vs10/pango.vcxproj.filtersin index c081a7be..e53594bc 100644 --- a/build/win32/vs10/pango.vcxproj.filtersin +++ b/win32/vs10/pango.vcxproj.filtersin @@ -15,14 +15,14 @@ </Filter> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\pango\pango.rc"><Filter>Resource Files</Filter></ResourceCompile> + <ResourceCompile Include="..\..\pango\pango.rc"><Filter>Resource Files</Filter></ResourceCompile> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\pango\break-arabic.c"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\..\..\pango\break-indic.c"><Filter>Source Files</Filter></ClCompile> + <ClCompile Include="..\..\pango\break-arabic.c"><Filter>Source Files</Filter></ClCompile> + <ClCompile Include="..\..\pango\break-indic.c"><Filter>Source Files</Filter></ClCompile> #include "pango.vs10.sourcefiles.filters" </ItemGroup> </Project> diff --git a/build/win32/vs10/pango.vcxprojin b/win32/vs10/pango.vcxprojin index 9aa7a1a6..4ea5df30 100644 --- a/build/win32/vs10/pango.vcxprojin +++ b/win32/vs10/pango.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> @@ -151,27 +149,21 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\pango\pango.rc" /> + <ResourceCompile Include="..\..\pango\pango.rc" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\pango\break-arabic.c" /> - <ClCompile Include="..\..\..\pango\break-indic.c" /> + <ClCompile Include="..\..\pango\break-arabic.c" /> + <ClCompile Include="..\..\pango\break-indic.c" /> #include "pango.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> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/build/win32/vs10/pangocairo.vcxproj.filtersin b/win32/vs10/pangocairo.vcxproj.filtersin index ebb09323..6cc96c29 100644 --- a/build/win32/vs10/pangocairo.vcxproj.filtersin +++ b/win32/vs10/pangocairo.vcxproj.filtersin @@ -15,15 +15,15 @@ </Filter> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\pango\pangocairo.rc"> + <ResourceCompile Include="..\..\pango\pangocairo.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\pango\pangocairo-fcfont.c"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\..\..\pango\pangocairo-fcfontmap.c"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\..\..\pango\pangocairo-win32font.c"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\..\..\pango\pangocairo-win32fontmap.c"><Filter>Source Files</Filter></ClCompile> + <ClCompile Include="..\..\pango\pangocairo-fcfont.c"><Filter>Source Files</Filter></ClCompile> + <ClCompile Include="..\..\pango\pangocairo-fcfontmap.c"><Filter>Source Files</Filter></ClCompile> + <ClCompile Include="..\..\pango\pangocairo-win32font.c"><Filter>Source Files</Filter></ClCompile> + <ClCompile Include="..\..\pango\pangocairo-win32fontmap.c"><Filter>Source Files</Filter></ClCompile> #include "pangocairo.vs10.sourcefiles.filters" </ItemGroup> </Project> diff --git a/build/win32/vs10/pangocairo.vcxprojin b/win32/vs10/pangocairo.vcxprojin index bc666849..49b95afb 100644 --- a/build/win32/vs10/pangocairo.vcxprojin +++ b/win32/vs10/pangocairo.vcxprojin @@ -125,14 +125,10 @@ </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)|$(Platform)'=='Debug_FC|Win32'">true</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">false</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">true</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)'=='Debug_FC'">true</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)'=='Release_FC'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -310,23 +306,19 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\pango\pangocairo.rc" /> + <ResourceCompile Include="..\..\pango\pangocairo.rc" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\pango\pangocairo-fcfont.c"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ClCompile Include="..\..\pango\pangocairo-fcfont.c"> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="..\..\..\pango\pangocairo-fcfontmap.c"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ClCompile Include="..\..\pango\pangocairo-fcfontmap.c"> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="..\..\..\pango\pangocairo-win32font.c" /> - <ClCompile Include="..\..\..\pango\pangocairo-win32fontmap.c" /> + <ClCompile Include="..\..\pango\pangocairo-win32font.c" /> + <ClCompile Include="..\..\pango\pangocairo-win32fontmap.c" /> #include "pangocairo.vs10.sourcefiles" </ItemGroup> <ItemGroup> diff --git a/build/win32/vs10/pangoft2.vcxproj.filtersin b/win32/vs10/pangoft2.vcxproj.filtersin index cae3b517..1d5ceaa2 100644 --- a/build/win32/vs10/pangoft2.vcxproj.filtersin +++ b/win32/vs10/pangoft2.vcxproj.filtersin @@ -15,7 +15,7 @@ </Filter> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\pango\pangoft2.rc"><Filter>Resource Files</Filter></ResourceCompile> + <ResourceCompile Include="..\..\pango\pangoft2.rc"><Filter>Resource Files</Filter></ResourceCompile> </ItemGroup> <ItemGroup> #include "pangoft2.vs10.sourcefiles.filters" diff --git a/build/win32/vs10/pangoft2.vcxprojin b/win32/vs10/pangoft2.vcxprojin index 0a81e6b2..fc7a4918 100644 --- a/build/win32/vs10/pangoft2.vcxprojin +++ b/win32/vs10/pangoft2.vcxprojin @@ -159,7 +159,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\pango\pangoft2.rc" /> + <ResourceCompile Include="..\..\pango\pangoft2.rc" /> </ItemGroup> <ItemGroup> #include "pangoft2.vs10.sourcefiles" diff --git a/build/win32/vs10/pangowin32.vcxproj.filtersin b/win32/vs10/pangowin32.vcxproj.filtersin index a4117708..0ad85fd4 100644 --- a/build/win32/vs10/pangowin32.vcxproj.filtersin +++ b/win32/vs10/pangowin32.vcxproj.filtersin @@ -15,7 +15,7 @@ </Filter> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\pango\pangowin32.rc"><Filter>Resource Files</Filter></ResourceCompile> + <ResourceCompile Include="..\..\pango\pangowin32.rc"><Filter>Resource Files</Filter></ResourceCompile> </ItemGroup> <ItemGroup> #include "pangowin32.vs10.sourcefiles.filters" diff --git a/build/win32/vs10/pangowin32.vcxprojin b/win32/vs10/pangowin32.vcxprojin index ba458c89..665d029a 100644 --- a/build/win32/vs10/pangowin32.vcxprojin +++ b/win32/vs10/pangowin32.vcxprojin @@ -171,7 +171,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\pango\pangowin32.rc" /> + <ResourceCompile Include="..\..\pango\pangowin32.rc" /> </ItemGroup> <ItemGroup> #include "pangowin32.vs10.sourcefiles" diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am index ff4af39e..bcbdc7fc 100644 --- a/build/win32/vs11/Makefile.am +++ b/win32/vs11/Makefile.am @@ -20,8 +20,10 @@ EXTRA_DIST = \ DISTCLEANFILES = $(EXTRA_DIST) +MSVC_BASE_VER = 10 +MSVC_BASE_VER_LONG = 2010 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 index b30d7899..d3f3a9b6 100644 --- a/build/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -20,8 +20,10 @@ EXTRA_DIST = \ DISTCLEANFILES = $(EXTRA_DIST) +MSVC_BASE_VER = 10 +MSVC_BASE_VER_LONG = 2010 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 index e735ba50..9d48dd2d 100644 --- a/build/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -20,8 +20,10 @@ EXTRA_DIST = \ DISTCLEANFILES = $(EXTRA_DIST) +MSVC_BASE_VER = 10 +MSVC_BASE_VER_LONG = 2010 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/Makefile.am b/win32/vs9/Makefile.am index 46b3ad4c..2495d594 100644 --- a/build/win32/vs9/Makefile.am +++ b/win32/vs9/Makefile.am @@ -22,8 +22,8 @@ EXTRA_DIST = \ README.txt \ $(GENERATED_ITEMS) -pango-install.vsprops: $(top_srcdir)/build/win32/vs9/pango-install.vspropsin pango.headers - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango-install.vspropsin >$@ +pango-install.vsprops: $(top_srcdir)/win32/vs9/pango-install.vspropsin pango.headers + $(CPP) -P - <$(top_srcdir)/win32/vs9/pango-install.vspropsin >$@ rm pango.headers DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/vs9/README.txt b/win32/vs9/README.txt index d02ed8e9..f4bdfbf1 100644 --- a/build/win32/vs9/README.txt +++ b/win32/vs9/README.txt @@ -34,7 +34,7 @@ caused by mixing calls to different CRTs can be kept at a minimum. zlib, libpng, and Cairo do contain support for compiling under VS9
using VS project files and/or makefiles at this time of writing.
For GLib, VS9 project files are available under
-$(srcroot)\build\vs9 in the case of GLib (stable/unstable).
+$(srcroot)\vs9 in the case of GLib (stable/unstable).
There is no known official VS9 build support for fontconfig
(along with freetype and expat which will work with the pre-compiled
@@ -73,7 +73,7 @@ Use the *_fc configs if the usage of fontconfig is desired; otherwise use the configs that do not end with _fc.
*this* file you are now reading is thus located at
-<root>\<this-pango-source-tree>\build\win32\vs9\README.txt.
+<root>\<this-pango-source-tree>\win32\vs9\README.txt.
<PlatformName> is either Win32 or x64, as in VS9 project files.
diff --git a/build/win32/vs9/pango-build-defines.vsprops b/win32/vs9/pango-build-defines.vsprops index 8ecd4336..8a3cbd5f 100644 --- a/build/win32/vs9/pango-build-defines.vsprops +++ b/win32/vs9/pango-build-defines.vsprops @@ -9,7 +9,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..;..\..\..\pango;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2" + AdditionalIncludeDirectories="..\..;..\..\pango;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2" PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES" ForcedIncludeFiles="msvc_recommended_pragmas.h" AdditionalOptions="/MP" diff --git a/build/win32/vs9/pango-ignore-fc.vsprops b/win32/vs9/pango-ignore-fc.vsprops index 965186fd..965186fd 100644 --- a/build/win32/vs9/pango-ignore-fc.vsprops +++ b/win32/vs9/pango-ignore-fc.vsprops diff --git a/build/win32/vs9/pango-install-bin.vsprops b/win32/vs9/pango-install-bin.vsprops index 729762ee..729762ee 100644 --- a/build/win32/vs9/pango-install-bin.vsprops +++ b/win32/vs9/pango-install-bin.vsprops diff --git a/build/win32/vs9/pango-install.vcproj b/win32/vs9/pango-install.vcproj index aba571b1..aba571b1 100644 --- a/build/win32/vs9/pango-install.vcproj +++ b/win32/vs9/pango-install.vcproj diff --git a/build/win32/vs9/pango-install.vspropsin b/win32/vs9/pango-install.vspropsin index 3ea9cb25..81bc7ecb 100644 --- a/build/win32/vs9/pango-install.vspropsin +++ b/win32/vs9/pango-install.vspropsin @@ -18,11 +18,11 @@ if exist ..\pangocairo.pc copy ..\pangocairo.pc $(CopyDir)\lib\pkgconfig
&# if "$(ConfigurationName)" == "Release" goto END
 if "$(ConfigurationName)" == "Debug" goto END
 -copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 -copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 -copy ..\..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 -copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 -copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 +copy ..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 +copy ..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 +copy ..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 +copy ..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 +copy ..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 if exist ..\pangoft2.pc copy ..\pangoft2.pc $(CopyDir)\lib\pkgconfig
 diff --git a/build/win32/vs9/pango-prebuild.vsprops b/win32/vs9/pango-prebuild.vsprops index 8c3274d4..df0f466f 100644 --- a/build/win32/vs9/pango-prebuild.vsprops +++ b/win32/vs9/pango-prebuild.vsprops @@ -7,6 +7,6 @@ > <UserMacro Name="CopyConfigH" - Value="copy ..\..\..\config.h.win32 ..\..\..\config.h" + Value="copy ..\..\config.h.win32 ..\..\config.h" /> </VisualStudioPropertySheet> diff --git a/build/win32/vs9/pango-version-paths.vsprops.in b/win32/vs9/pango-version-paths.vsprops.in index 059527dc..fc3b9e3f 100644 --- a/build/win32/vs9/pango-version-paths.vsprops.in +++ b/win32/vs9/pango-version-paths.vsprops.in @@ -26,7 +26,7 @@ /> <UserMacro Name="GlibEtcInstallRoot" - Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)" + Value="$(SolutionDir)\..\..\..\vs$(VSVer)\$(PlatformName)" /> <UserMacro Name="CopyDir" @@ -66,4 +66,4 @@ Name="PythonPathX64" Value="$(PythonPath).x64" /> -</VisualStudioPropertySheet>
\ No newline at end of file +</VisualStudioPropertySheet> diff --git a/build/win32/vs9/pango.sln b/win32/vs9/pango.sln index 4c945bc7..4c945bc7 100644 --- a/build/win32/vs9/pango.sln +++ b/win32/vs9/pango.sln diff --git a/build/win32/vs9/pango.vcprojin b/win32/vs9/pango.vcprojin index a00dd871..0b396379 100644 --- a/build/win32/vs9/pango.vcprojin +++ b/win32/vs9/pango.vcprojin @@ -144,14 +144,14 @@ 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="..\..\..\pango\pango.rc" /> - <File RelativePath="..\..\..\config.h.win32"> + <File RelativePath="..\..\pango\pango.rc" /> + <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"> @@ -159,7 +159,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> </FileConfiguration> <FileConfiguration Name="Debug|x64"> @@ -167,7 +167,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> </FileConfiguration> <FileConfiguration Name="Release|x64"> @@ -175,7 +175,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> </FileConfiguration> </File> @@ -185,8 +185,8 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File RelativePath="..\..\..\pango\break-arabic.c" /> - <File RelativePath="..\..\..\pango\break-indic.c" /> + <File RelativePath="..\..\pango\break-arabic.c" /> + <File RelativePath="..\..\pango\break-indic.c" /> #include "pango.sourcefiles" </Filter> </Files> diff --git a/build/win32/vs9/pangocairo.vcprojin b/win32/vs9/pangocairo.vcprojin index 8725d0a6..498d96ec 100644 --- a/build/win32/vs9/pangocairo.vcprojin +++ b/win32/vs9/pangocairo.vcprojin @@ -275,27 +275,27 @@ 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="..\..\..\pango\pangocairo.rc" /> + <File RelativePath="..\..\pango\pangocairo.rc" /> </Filter> <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File RelativePath="..\..\..\pango\pangocairo-fcfont.c" > + <File RelativePath="..\..\pango\pangocairo-fcfont.c" > <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\pango\pangocairo-fcfontmap.c" > + <File RelativePath="..\..\pango\pangocairo-fcfontmap.c" > <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\pango\pangocairo-win32font.c" /> - <File RelativePath="..\..\..\pango\pangocairo-win32fontmap.c" /> + <File RelativePath="..\..\pango\pangocairo-win32font.c" /> + <File RelativePath="..\..\pango\pangocairo-win32fontmap.c" /> #include "pangocairo.sourcefiles" </Filter> </Files> diff --git a/build/win32/vs9/pangoft2.vcprojin b/win32/vs9/pangoft2.vcprojin index 74dbcfbd..e173dc3f 100644 --- a/build/win32/vs9/pangoft2.vcprojin +++ b/win32/vs9/pangoft2.vcprojin @@ -155,7 +155,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > <File - RelativePath="..\..\..\pango\pangoft2.rc" + RelativePath="..\..\pango\pangoft2.rc" > </File> </Filter> diff --git a/build/win32/vs9/pangowin32.vcprojin b/win32/vs9/pangowin32.vcprojin index 6c06721f..449f5558 100644 --- a/build/win32/vs9/pangowin32.vcprojin +++ b/win32/vs9/pangowin32.vcprojin @@ -152,7 +152,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="..\..\..\pango\pangowin32.rc" /> + <File RelativePath="..\..\pango\pangowin32.rc" /> </Filter> <Filter Name="Source Files" diff --git a/build/win32/vs9/stdint.h b/win32/vs9/stdint.h index fcab43a8..fcab43a8 100644 --- a/build/win32/vs9/stdint.h +++ b/win32/vs9/stdint.h |