From 0654e1ca0a22c2afc1c971958b85fc2f8e6a6bea Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Tue, 10 Apr 2018 19:16:09 +0200 Subject: [PATCH] dropping windows build fragments - let upstream deal with this. --- .gitignore | 5 +- ChangeLog | 6 + Makefile.am | 53 +---- build/Makefile-newvs.am | 53 ----- build/Makefile.am | 1 - build/Makefile.msvc-introspection | 126 ---------- build/Makefile.msvcproj | 116 ---------- build/win32/Makefile.am | 39 ---- build/win32/detectenv-msvc.mak | 78 ------- build/win32/introspection-msvc.mak | 94 -------- build/win32/pc_base.py | 124 ---------- build/win32/replace.py | 115 --------- build/win32/rsvg-introspection-msvc.mak | 35 --- build/win32/rsvgpc.py | 33 --- build/win32/vs10/Makefile.am | 42 ---- build/win32/vs10/README.txt | 74 ------ build/win32/vs10/libpixbufloader-svg.vcxproj | 179 -------------- .../vs10/libpixbufloader-svg.vcxproj.filters | 20 -- build/win32/vs10/librsvg.sln | 72 ------ build/win32/vs10/rsvg-build-defines.props | 67 ------ .../win32/vs10/rsvg-convert.vcxproj.filtersin | 20 -- build/win32/vs10/rsvg-convert.vcxprojin | 174 -------------- build/win32/vs10/rsvg-gen-srcs.props | 25 -- build/win32/vs10/rsvg-install.propsin | 54 ----- build/win32/vs10/rsvg-install.vcxproj | 115 --------- build/win32/vs10/rsvg-install.vcxproj.filters | 21 -- build/win32/vs10/rsvg-introspect.vcxproj | 103 -------- build/win32/vs10/rsvg-version-paths.props.in | 89 ------- build/win32/vs10/rsvg-view-3.vcxproj | 177 -------------- build/win32/vs10/rsvg-view-3.vcxproj.filters | 20 -- build/win32/vs10/rsvg.vcxproj.filtersin | 24 -- build/win32/vs10/rsvg.vcxprojin | 219 ------------------ build/win32/vs11/Makefile.am | 30 --- build/win32/vs12/Makefile.am | 26 --- build/win32/vs14/Makefile.am | 26 --- build/win32/vs15/Makefile.am | 27 --- build/win32/vs9/Makefile.am | 28 --- build/win32/vs9/README.txt | 74 ------ build/win32/vs9/libpixbufloader-svg.vcproj | 170 -------------- build/win32/vs9/librsvg.sln | 90 ------- build/win32/vs9/math.h | 39 ---- build/win32/vs9/rsvg-build-defines.vsprops | 58 ----- build/win32/vs9/rsvg-convert.vcprojin | 167 ------------- build/win32/vs9/rsvg-gen-srcs.vsprops | 19 -- build/win32/vs9/rsvg-install.vcproj | 114 --------- build/win32/vs9/rsvg-install.vspropsin | 44 ---- build/win32/vs9/rsvg-introspect.vcproj | 76 ------ build/win32/vs9/rsvg-version-paths.vsprops.in | 81 ------- build/win32/vs9/rsvg-view-3.vcproj | 170 -------------- build/win32/vs9/rsvg.vcprojin | 198 ---------------- config.h.win32.in | 97 -------- configure.ac | 31 +-- 52 files changed, 19 insertions(+), 3919 deletions(-) delete mode 100644 build/Makefile-newvs.am delete mode 100644 build/Makefile.am delete mode 100644 build/Makefile.msvc-introspection delete mode 100644 build/Makefile.msvcproj delete mode 100644 build/win32/Makefile.am delete mode 100644 build/win32/detectenv-msvc.mak delete mode 100644 build/win32/introspection-msvc.mak delete mode 100644 build/win32/pc_base.py delete mode 100644 build/win32/replace.py delete mode 100644 build/win32/rsvg-introspection-msvc.mak delete mode 100644 build/win32/rsvgpc.py delete mode 100644 build/win32/vs10/Makefile.am delete mode 100644 build/win32/vs10/README.txt delete mode 100644 build/win32/vs10/libpixbufloader-svg.vcxproj delete mode 100644 build/win32/vs10/libpixbufloader-svg.vcxproj.filters delete mode 100644 build/win32/vs10/librsvg.sln delete mode 100644 build/win32/vs10/rsvg-build-defines.props delete mode 100644 build/win32/vs10/rsvg-convert.vcxproj.filtersin delete mode 100644 build/win32/vs10/rsvg-convert.vcxprojin delete mode 100644 build/win32/vs10/rsvg-gen-srcs.props delete mode 100644 build/win32/vs10/rsvg-install.propsin delete mode 100644 build/win32/vs10/rsvg-install.vcxproj delete mode 100644 build/win32/vs10/rsvg-install.vcxproj.filters delete mode 100644 build/win32/vs10/rsvg-introspect.vcxproj delete mode 100644 build/win32/vs10/rsvg-version-paths.props.in delete mode 100644 build/win32/vs10/rsvg-view-3.vcxproj delete mode 100644 build/win32/vs10/rsvg-view-3.vcxproj.filters delete mode 100644 build/win32/vs10/rsvg.vcxproj.filtersin delete mode 100644 build/win32/vs10/rsvg.vcxprojin delete mode 100644 build/win32/vs11/Makefile.am delete mode 100644 build/win32/vs12/Makefile.am delete mode 100644 build/win32/vs14/Makefile.am delete mode 100644 build/win32/vs15/Makefile.am delete mode 100644 build/win32/vs9/Makefile.am delete mode 100644 build/win32/vs9/README.txt delete mode 100644 build/win32/vs9/libpixbufloader-svg.vcproj delete mode 100644 build/win32/vs9/librsvg.sln delete mode 100644 build/win32/vs9/math.h delete mode 100644 build/win32/vs9/rsvg-build-defines.vsprops delete mode 100644 build/win32/vs9/rsvg-convert.vcprojin delete mode 100644 build/win32/vs9/rsvg-gen-srcs.vsprops delete mode 100644 build/win32/vs9/rsvg-install.vcproj delete mode 100644 build/win32/vs9/rsvg-install.vspropsin delete mode 100644 build/win32/vs9/rsvg-introspect.vcproj delete mode 100644 build/win32/vs9/rsvg-version-paths.vsprops.in delete mode 100644 build/win32/vs9/rsvg-view-3.vcproj delete mode 100644 build/win32/vs9/rsvg.vcprojin delete mode 100644 config.h.win32.in diff --git a/.gitignore b/.gitignore index c0ecb16f2..6ba5a379a 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ m4/pkg.m4 # documentation generated files doc/*.stamp +doc/*.bak doc/html doc/xml doc/rsvg-decl-list.txt @@ -70,7 +71,3 @@ doc/rsvg.interfaces doc/rsvg.prerequisites doc/rsvg.signals doc/version.xml - -# windows build fragments -*.props -*.vsprops diff --git a/ChangeLog b/ChangeLog index bd7590303..ceaa4978d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ +2018-04-10 Andreas Grapentin + + * build: dropping win32 build fragments + * configure.ac: likewise + * Makefile.am: likewise + 2018-04-10 Andreas Grapentin * configure.ac: moved aux files to build-aux diff --git a/Makefile.am b/Makefile.am index cb2374a54..f9e0157b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,7 @@ -SUBDIRS = . gdk-pixbuf-loader tests tools doc build + +ACLOCAL_AMFLAGS = -I m4 + +SUBDIRS = . gdk-pixbuf-loader tests tools doc NULL = BUILT_SOURCES = @@ -166,8 +169,6 @@ EXTRA_DIST = \ gtk-doc.make \ Rsvg-2.0-custom.vala \ Rsvg-2.0.metadata \ - config.h.win32.in \ - config.h.win32 \ rsvg.symbols \ glib-tap.mk \ tap-driver.sh \ @@ -271,49 +272,3 @@ CLEANFILES += $(VAPIGEN_VAPIS) endif # ENABLE_VAPIGEN endif # HAVE_INTROSPECTION - -# ------------------- MSVC Build Items ---------------- - -MSVCPROJS = rsvg rsvg-convert - -rsvg_FILES = $(librsvg_@RSVG_API_MAJOR_VERSION@_la_SOURCES) -rsvg_EXCLUDES = dummy -rsvg_HEADERS_DIR = $(librsvgincdir) -rsvg_HEADERS_INST = $(librsvginc_HEADERS) - -rsvg_HEADERS_EXCLUDES = dummy - -rsvg_convert_FILES = $(rsvg_convert_SOURCES) -rsvg_convert_EXCLUDES = dummy - -include $(top_srcdir)/build/Makefile.msvcproj - -# autotools: Why must we do this instead of dist-hook? -MSVCPROJ_GENERATED = \ - $(top_builddir)/build/win32/vs9/rsvg.vcproj \ - $(top_builddir)/build/win32/vs9/rsvg-convert.vcproj - -if HAVE_INTROSPECTION - -MSVC_INTROSPECT_GIRS = $(INTROSPECTION_GIRS) - -INTROSPECTION_INTERMEDIATE_ITEMS = \ - $(top_builddir)/build/win32/Rsvg-@RSVG_API_VERSION@.gir.msvc.introspect \ - $(top_builddir)/build/win32/Rsvg_@RSVG_API_VERSION_U@_gir_list - -Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_FILES = $(Rsvg_@RSVG_API_VERSION_U@_gir_FILES) -Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_PACKAGES = $(Rsvg_@RSVG_API_VERSION_U@_gir_PACKAGES) -Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_EXPORT_PACKAGES = $(Rsvg_@RSVG_API_VERSION_U@_gir_EXPORT_PACKAGES) -Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_INCLUDE_GIRS = $(Rsvg_@RSVG_API_VERSION_U@_gir_INCLUDES) -Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_LIBS = rsvg-@RSVG_API_VERSION@ -Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_CFLAGS = -I../.. -DRSVG_COMPILATION -Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_SCANNERFLAGS = $(Rsvg_@RSVG_API_VERSION_U@_gir_SCANNERFLAGS) - -MSVCPROJ_GENERATED += $(INTROSPECTION_INTERMEDIATE_ITEMS) - -include $(top_srcdir)/build/Makefile.msvc-introspection -endif # HAVE_INTROSPECTION - -$(MSVCPROJ_GENERATED): $(top_builddir)/build/win32/vs9/rsvg.headers - -EXTRA_DIST += $(MSVCPROJ_GENERATED) diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am deleted file mode 100644 index c36de5966..000000000 --- a/build/Makefile-newvs.am +++ /dev/null @@ -1,53 +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 target Visual Studio (2012, 2013, 14, 15 and so on) -# MSVC_VER: Short Version of target Visual Studio (11 for 2012, 12 for 2013, 14 for 2015, 15 for 2017) -# MSVC_TOOLSET: Use if target MSVC toolset is not in the form v$(MSVC_VER)0, meaning v$(MSVC_TOOLSET) - -if MSVC_BASE_NO_TOOLSET_SET -MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 -endif - -if MSVC_NO_TOOLSET_SET -MSVC_TOOLSET = $(MSVC_VER)0 -endif - -%.sln: - sed 's/11\.00/$(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_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/v100/v$(MSVC_TOOLSET)/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/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/10<\/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 0f81afe38..000000000 --- a/build/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = win32 diff --git a/build/Makefile.msvc-introspection b/build/Makefile.msvc-introspection deleted file mode 100644 index f99fd93ab..000000000 --- a/build/Makefile.msvc-introspection +++ /dev/null @@ -1,126 +0,0 @@ -# Author: Fan, Chun-wei -# 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 -# project, which may be included in projects that support both -# Visual Studio builds and introspection. - -# * Input variables: -# -# MSVC_INTROSPECT_GIRS - List of .gir's that should be built -# in the NMake Makefiles -# -# * Simple tutorial -# -# Add this to Makefile.am where your library/program is built: -# (Either YourLib_1_0_gir_MSVC_LIBS or YourLib_1_0_gir_MSVC_PROGRAM -# is required unless --headers-only is specified in -# YourLib_1_0_gir__MSVC_SCANNERFLAGS) -# -# include $(top_srcdir)/build/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 -# YourLib_1_0_gir_MSVC_LIBS = yourlib-1.0 -# YourLib_1_0_gir_MSVC_FILES = $(libyourlib_1_0_SOURCES) -# YourLib_1_0_gir_MSVC_PROGRAM = YourProgram -# YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files) -# YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's) -# YourLiv_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir) - -# 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 -_gir_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) - -# Namespace and Version is either fetched from the gir filename -# or the _NAMESPACE/_VERSION variable combo -_gir_namespace_msvc = $(or $($(_gir_name)_NAMESPACE),$(firstword $(subst -, ,$(notdir $(1))))) -_gir_version_msvc = $(or $($(_gir_name)_VERSION),$(lastword $(subst -, ,$(1:.gir=)))) -_typelib_basename_msvc = $(_gir_namespace_msvc)'-'$(_gir_version_msvc) - -# _PROGRAM is an optional variable which needs its own --program argument -_gir_program_msvc = $(if $($(_gir_name)_MSVC_PROGRAM),--program=$($(_gir_name)_MSVC_PROGRAM)) - -# Deduce the sub-folder from $(srcroot) where the sources reside in -_gir_source_path_raw_msvc:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) -_gir_source_path_msvc=$(subst /,\\,$(_gir_source_path_raw_msvc)) -_gir_source_subdir_int_msvc=$(subst \\\\,\\,\\$(_gir_source_path_msvc)\\) -_gir_source_subdir_msvc=$(subst \\.\\,\\,$(_gir_source_subdir_int_msvc)) - -_gir_files_raw_msvc=$(subst /,\\,$($(_gir_name)_MSVC_FILES)) -_gir_files_msvc=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_gir_source_path_msvc)\\,\\,$(_gir_files_raw_msvc)))) - -# Create a list of items for: -# - Libraries -# - Packages -# - GIRs to include -# - packages to export - -_gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib)) -_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg)) -_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include)) -_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg)) - -# -# Create NMake Makefile Sections for Building Introspection files -# from autotools files -# $(1) - File Name of the .gir that is to be generated -# - -define gir-nmake-builder - -# Basic sanity check, to make sure required variables are set -$(if $($(_gir_name)_MSVC_FILES),,$(error Need to define $(_gir_name)_MSVC_FILES)) -$(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)), - $($(_gir_name)_MSVC_LIBS), - $($(_gir_name)_MSVC_PROGRAM)),, - $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM)) - -$(top_builddir)/build/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 \ - ;; \ - esac; \ - done - -$(top_builddir)/build/win32/$(1).msvc.introspect: - -$(RM) $(top_builddir)/build/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 ' -Lvs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin \'>>$(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 - -# 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 -endef - -$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir)))) diff --git a/build/Makefile.msvcproj b/build/Makefile.msvcproj deleted file mode 100644 index 166d1d2a4..000000000 --- a/build/Makefile.msvcproj +++ /dev/null @@ -1,116 +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 = ... # -# -# 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 - -$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj.filters - - - for F in $(_proj_files); do \ - case $$$$F in \ - $(_proj_filters)) \ - ;; \ - *.c|*.cpp|*.cc|*.cxx) \ - echo ' ' >>$(1).sourcefiles && \ - echo ' ' >>$(1).vs10.sourcefiles && \ - echo ' Source Files' >>$(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/build/win32/Makefile.am b/build/win32/Makefile.am deleted file mode 100644 index c8c67af30..000000000 --- a/build/win32/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -SUBDIRS = \ - vs9 \ - vs10 \ - vs11 \ - vs12 \ - vs14 \ - vs15 - -if HAVE_INTROSPECTION -GENERATED_ITEMS = \ - introspection.body.mak \ - Rsvg_@RSVG_API_VERSION_U@_gir_list - -MSVC_INTROSPECTION_INTERMEDIATE_FILES = Rsvg-@RSVG_API_VERSION@.gir.msvc.introspect - -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 \ - ;; \ - esac; \ - done - $(RM) $(MSVC_INTROSPECTION_INTERMEDIATE_FILES) - -DISTCLEANFILES = $(GENERATED_ITEMS) - -else -GENERATED_ITEMS = -endif - -EXTRA_DIST = \ - rsvg-introspection-msvc.mak \ - introspection-msvc.mak \ - detectenv-msvc.mak \ - pc_base.py \ - replace.py \ - rsvgpc.py \ - $(GENERATED_ITEMS) diff --git a/build/win32/detectenv-msvc.mak b/build/win32/detectenv-msvc.mak deleted file mode 100644 index 6fd96ccc6..000000000 --- a/build/win32/detectenv-msvc.mak +++ /dev/null @@ -1,78 +0,0 @@ -# Common NMake Makefile module for checking the build environment -# This can be copied from $(glib_srcroot)\build\win32 for GNOME items -# that support MSVC builds and introspection under MSVC, and can be used -# for building test programs as well. - -# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or -# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir) -!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR) -MSG = ^ -This Makefile is only for Visual Studio 2008 and later.^ -You need to ensure that the Visual Studio Environment is properly set up^ -before running this Makefile. -!error $(MSG) -!endif - -ERRNUL = 2>NUL -_HASH=^# - -!if ![echo VCVERSION=_MSC_VER > vercl.x] \ - && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \ - && ![echo PLAT=Win32 >> vercl.x] \ - && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \ - && ![echo PLAT=x64 >> vercl.x] \ - && ![echo $(_HASH)endif >> vercl.x] \ - && ![cl -nologo -TC -P vercl.x $(ERRNUL)] -!include vercl.i -!if ![echo VCVER= ^\> vercl.vc] \ - && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] -!include vercl.vc -!endif -!endif -!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] -!endif - -!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600 -VSVER = 9 -!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700 -VSVER = 10 -!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800 -VSVER = 11 -!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900 -VSVER = 12 -!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910 -VSVER = 14 -!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000 -VSVER = 15 -!else -VSVER = 0 -!endif - -!if "$(VSVER)" == "0" -MSG = ^ -This NMake Makefile set supports Visual Studio^ -9 (2008) through 14 (2015). Your Visual Studio^ -version is not supported. -!error $(MSG) -!endif - -VALID_CFGSET = FALSE -!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug" -VALID_CFGSET = TRUE -!endif - -# We want debugging symbols logged for all builds, -# using .pdb files for release builds -CFLAGS_BASE = /Zi - -!if "$(CFG)" == "release" || "$(CFG)" == "Release" -CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE) -!else -CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE) -!endif - -!if "$(PLAT)" == "x64" -LDFLAGS_ARCH = /machine:x64 -!else -LDFLAGS_ARCH = /machine:x86 -!endif diff --git a/build/win32/introspection-msvc.mak b/build/win32/introspection-msvc.mak deleted file mode 100644 index 873984421..000000000 --- a/build/win32/introspection-msvc.mak +++ /dev/null @@ -1,94 +0,0 @@ -# Common NMake Makefile module for checking the build environment is sane -# for building introspection files under MSVC/NMake. -# This can be copied from $(gi_srcroot)\build\win32 for GNOME items -# that support MSVC builds and introspection under MSVC. - -# Can override with env vars as needed -# You will need to have built gobject-introspection for this to work. -# Change or pass in or set the following to suit your environment - -!if "$(PREFIX)" == "" -PREFIX = ..\..\..\vs$(VSVER)\$(PLAT) -!endif - -!if ![setlocal] && \ - ![set PFX=$(PREFIX)] && \ - ![for %P in (%PFX%) do @echo PREFIX_FULL=%~dpnfP > pfx.x] -!endif -!include pfx.x - -!if "$(PKG_CONFIG_PATH)" == "" -PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig -!else -PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig;$(PKG_CONFIG_PATH) -!endif - -!if ![del $(ERRNUL) /q/f pfx.x] -!endif - -# Note: The PYTHON must be the Python release series that was used to build -# the GObject-introspection scanner Python module! -# Either having python.exe your PATH will work or passing in -# PYTHON= will do - -# This is required, and gobject-introspection needs to be built -# before this can be successfully run. -!if "$(PYTHON)" == "" -PYTHON=python -!endif - -# Path to the pkg-config tool, if not already in the PATH -!if "$(PKG_CONFIG)" == "" -PKG_CONFIG=pkg-config -!endif - -# Don't change anything following this line! - -GIR_SUBDIR = share\gir-1.0 -GIR_TYPELIBDIR = lib\girepository-1.0 -G_IR_SCANNER = $(PREFIX)\bin\g-ir-scanner -G_IR_COMPILER = $(PREFIX)\bin\g-ir-compiler.exe -G_IR_INCLUDEDIR = $(PREFIX)\$(GIR_SUBDIR) -G_IR_TYPELIBDIR = $(PREFIX)\$(GIR_TYPELIBDIR) - -VALID_PKG_CONFIG_PATH = FALSE - -MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH -MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files - -ERROR_MSG = - -BUILD_INTROSPECTION = TRUE - -!if ![set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)] \ - && ![$(PKG_CONFIG) --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x] \ - && ![setlocal] \ - && ![set file="pkgconfig.x"] \ - && ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize] \ - && ![del $(ERRNUL) /q/f pkgconfig.x] -!endif - -!include pkgconfig.chksize -!if "$(PKG_CHECK_SIZE)" == "0" -VALID_PKG_CONFIG_PATH = TRUE -!else -VALID_PKG_CONFIG_PATH = FALSE -!endif - -!if ![del $(ERRNUL) /q/f pkgconfig.chksize] -!endif - -VALID_CFGSET = FALSE -!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug" -VALID_CFGSET = TRUE -!endif - -!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE" -BUILD_INTROSPECTION = FALSE -ERROR_MSG = $(MSG_INVALID_PKGCONFIG) -!endif - -!if "$(VALID_CFGSET)" != "TRUE" -BUILD_INTROSPECTION = FALSE -ERROR_MSG = $(MSG_INVALID_CFG) -!endif diff --git a/build/win32/pc_base.py b/build/win32/pc_base.py deleted file mode 100644 index f96ef5912..000000000 --- a/build/win32/pc_base.py +++ /dev/null @@ -1,124 +0,0 @@ -#!/usr/bin/python -# -# Simple utility script to generate the basic info -# needed in a .pc (pkg-config) file, used especially -# for introspection purposes - -# This can be used in various projects where -# there is the need to generate .pc files, -# and is copied from GLib's $(srcroot)/win32 - -# Author: Fan, Chun-wei -# Date: March 10, 2016 - -import os -import sys -import argparse - -class BasePCItems: - def __init__(self): - self.base_replace_items = {} - self.exec_prefix = '' - self.includedir = '' - self.libdir = '' - self.prefix = '' - self.srcdir = os.path.dirname(__file__) - self.top_srcdir = self.srcdir + '\\..\\..' - self.version = '' - - def setup(self, argv, parser=None): - if parser is None: - parser = argparse.ArgumentParser(description='Setup basic .pc file info') - parser.add_argument('--prefix', help='prefix of the installed library', - required=True) - parser.add_argument('--exec-prefix', - help='prefix of the installed programs, \ - if different from the prefix') - parser.add_argument('--includedir', - help='includedir of the installed library, \ - if different from ${prefix}/include') - parser.add_argument('--libdir', - help='libdir of the installed library, \ - if different from ${prefix}/lib') - parser.add_argument('--version', help='Version of the package', - required=True) - args = parser.parse_args() - - self.version = args.version - - # check whether the prefix and exec_prefix are valid - if not os.path.exists(args.prefix): - raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix) - - # use absolute paths for prefix - self.prefix = os.path.abspath(args.prefix).replace('\\','/') - - # check and setup the exec_prefix - if getattr(args, 'exec_prefix', None) is None: - exec_prefix_use_shorthand = True - self.exec_prefix = '${prefix}' - else: - if args.exec_prefix.startswith('${prefix}'): - exec_prefix_use_shorthand = True - input_exec_prefix = args.prefix + args.exec_prefix[len('${prefix}'):] - else: - exec_prefix_use_shorthand = False - input_exec_prefix = args.exec_prefix - if not os.path.exists(input_exec_prefix): - raise SystemExit('Specified exec_prefix \'%s\' is invalid' % - args.exec_prefix) - if exec_prefix_use_shorthand is True: - self.exec_prefix = args.exec_prefix.replace('\\','/') - else: - self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/') - - # check and setup the includedir - if getattr(args, 'includedir', None) is None: - self.includedir = '${prefix}/include' - else: - if args.includedir.startswith('${prefix}'): - includedir_use_shorthand = True - input_includedir = args.prefix + args.includedir[len('${prefix}'):] - else: - if args.includedir.startswith('${exec_prefix}'): - includedir_use_shorthand = True - input_includedir = input_exec_prefix + args.includedir[len('${exec_prefix}'):] - else: - includedir_use_shorthand = False - input_includedir = args.includedir - if not os.path.exists(input_includedir): - raise SystemExit('Specified includedir \'%s\' is invalid' % - args.includedir) - if includedir_use_shorthand is True: - self.includedir = args.includedir.replace('\\','/') - else: - self.includedir = os.path.abspath(input_includedir).replace('\\','/') - - # check and setup the libdir - if getattr(args, 'libdir', None) is None: - self.libdir = '${prefix}/lib' - else: - if args.libdir.startswith('${prefix}'): - libdir_use_shorthand = True - input_libdir = args.prefix + args.libdir[len('${prefix}'):] - else: - if args.libdir.startswith('${exec_prefix}'): - libdir_use_shorthand = True - input_libdir = input_exec_prefix + args.libdir[len('${exec_prefix}'):] - else: - libdir_use_shorthand = False - input_libdir = args.libdir - if not os.path.exists(input_libdir): - raise SystemExit('Specified libdir \'%s\' is invalid' % - args.libdir) - if libdir_use_shorthand is True: - self.libdir = args.libdir.replace('\\','/') - else: - self.libdir = os.path.abspath(input_libdir).replace('\\','/') - - # setup dictionary for replacing items in *.pc.in - self.base_replace_items.update({'@VERSION@': self.version}) - self.base_replace_items.update({'@prefix@': self.prefix}) - self.base_replace_items.update({'@exec_prefix@': self.exec_prefix}) - self.base_replace_items.update({'@libdir@': self.libdir}) - self.base_replace_items.update({'@includedir@': self.includedir}) diff --git a/build/win32/replace.py b/build/win32/replace.py deleted file mode 100644 index 3aeceb1f7..000000000 --- a/build/win32/replace.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/python -# -# Simple utility script to manipulate -# certain types of strings in a file - -# This can be used in various projects where -# there is the need to replace strings in files, -# and is copied from GLib's $(srcroot)/win32 - -# Author: Fan, Chun-wei -# Date: September 03, 2014 - -import os -import sys -import re -import string -import argparse - -valid_actions = ['remove-prefix', - 'replace-var', - 'replace-str', - 'remove-str'] - -def open_file(filename, mode): - if sys.version_info[0] < 3: - return open(filename, mode=mode) - else: - return open(filename, mode=mode, encoding='utf-8') - -def replace_multi(src, dest, replace_items): - with open_file(src, 'r') as s: - with open_file(dest, 'w') as d: - for line in s: - replace_dict = dict((re.escape(key), value) \ - for key, value in replace_items.items()) - replace_pattern = re.compile("|".join(replace_dict.keys())) - d.write(replace_pattern.sub(lambda m: \ - replace_dict[re.escape(m.group(0))], line)) - -def replace(src, dest, instring, outstring): - replace_item = {instring: outstring} - replace_multi(src, dest, replace_item) - -def check_required_args(args, params): - for param in params: - if getattr(args, param, None) is None: - raise SystemExit('%s: error: --%s argument is required' % (__file__, param)) - -def warn_ignored_args(args, params): - for param in params: - if getattr(args, param, None) is not None: - print('%s: warning: --%s argument is ignored' % (__file__, param)) - -def main(argv): - - parser = argparse.ArgumentParser(description='Process strings in a file.') - parser.add_argument('-a', - '--action', - help='Action to carry out. Can be one of:\n' - 'remove-prefix\n' - 'replace-var\n' - 'replace-str\n' - 'remove-str', - choices=valid_actions) - parser.add_argument('-i', '--input', help='Input file') - parser.add_argument('-o', '--output', help='Output file') - parser.add_argument('--instring', help='String to replace or remove') - parser.add_argument('--var', help='Autotools variable name to replace') - parser.add_argument('--outstring', - help='New String to replace specified string or variable') - parser.add_argument('--removeprefix', help='Prefix of string to remove') - - args = parser.parse_args() - - input_string = '' - output_string = '' - - # We must have action, input, output for all operations - check_required_args(args, ['action','input','output']) - - # Build the arguments by the operation that is to be done, - # to be fed into replace() - - # Get rid of prefixes from a string - if args.action == 'remove-prefix': - check_required_args(args, ['instring','removeprefix']) - warn_ignored_args(args, ['outstring','var']) - input_string = args.removeprefix + args.instring - output_string = args.instring - - # Replace an m4-style variable (those surrounded by @...@) - if args.action == 'replace-var': - check_required_args(args, ['var','outstring']) - warn_ignored_args(args, ['instring','removeprefix']) - input_string = '@' + args.var + '@' - output_string = args.outstring - - # Replace a string - if args.action == 'replace-str': - check_required_args(args, ['instring','outstring']) - warn_ignored_args(args, ['var','removeprefix']) - input_string = args.instring - output_string = args.outstring - - # Remove a string - if args.action == 'remove-str': - check_required_args(args, ['instring']) - warn_ignored_args(args, ['var','outstring','removeprefix']) - input_string = args.instring - output_string = '' - - replace(args.input, args.output, input_string, output_string) - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/build/win32/rsvg-introspection-msvc.mak b/build/win32/rsvg-introspection-msvc.mak deleted file mode 100644 index 1083f3d23..000000000 --- a/build/win32/rsvg-introspection-msvc.mak +++ /dev/null @@ -1,35 +0,0 @@ -# NMake Makefile to build Introspection Files for GDK-Pixbuf - -!include detectenv-msvc.mak - -APIVERSION = 2.0 - -CHECK_PACKAGE = gdk-pixbuf-2.0 - -!include introspection-msvc.mak - -!if "$(BUILD_INTROSPECTION)" == "TRUE" -all: setgirbuildenv Rsvg-$(APIVERSION).gir Rsvg-$(APIVERSION).typelib - -setgirbuildenv: - @-set PYTHONPATH=$(PREFIX)\lib\gobject-introspection - @-set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH) - @-set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) - @-set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB) - -!include introspection.body.mak - -install-introspection: all - @-copy Rsvg-$(APIVERSION).gir $(G_IR_INCLUDEDIR) - @-copy /b Rsvg-$(APIVERSION).typelib $(G_IR_TYPELIBDIR) - -!else -all: - @-echo $(ERROR_MSG) - -install-introspection: all -!endif - -clean: - @-del /f/q Rsvg-$(APIVERSION).typelib - @-del /f/q Rsvg-$(APIVERSION).gir diff --git a/build/win32/rsvgpc.py b/build/win32/rsvgpc.py deleted file mode 100644 index d72616b83..000000000 --- a/build/win32/rsvgpc.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/python -# -# Utility script to generate .pc files for GLib -# for Visual Studio builds, to be used for -# building introspection files - -# Author: Fan, Chun-wei -# Date: March 10, 2016 - -import os -import sys - -from replace import replace_multi -from pc_base import BasePCItems - -def main(argv): - rsvg_api_ver = '2.0' - base_pc = BasePCItems() - - base_pc.setup(argv) - pkg_replace_items = {'@RSVG_API_MAJOR_VERSION@': rsvg_api_ver, - '@RSVG_API_VERSION@': rsvg_api_ver, - ' -lm': ''} - - pkg_replace_items.update(base_pc.base_replace_items) - - # Generate librsvg-$(rsvg_api_ver).pc - replace_multi(base_pc.top_srcdir + '/librsvg.pc.in', - base_pc.srcdir + '/librsvg-' + rsvg_api_ver + '.pc', - pkg_replace_items) - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am deleted file mode 100644 index bc44ce7ab..000000000 --- a/build/win32/vs10/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -GENERATED_ITEMS = \ - rsvg.vcxproj \ - rsvg.vcxproj.filters \ - rsvg-convert.vcxproj \ - rsvg-convert.vcxproj.filters \ - rsvg-install.props \ - math.h - -EXTRA_DIST = \ - librsvg.sln \ - rsvg-build-defines.props \ - rsvg-gen-srcs.props \ - rsvg-install.propsin \ - rsvg-version-paths.props \ - libpixbufloader-svg.vcxproj \ - libpixbufloader-svg.vcxproj.filters \ - rsvg.vcxprojin \ - rsvg.vcxproj.filtersin \ - rsvg-convert.vcxprojin \ - rsvg-convert.vcxproj.filtersin \ - rsvg-install.vcxproj \ - rsvg-install.vcxproj.filters \ - rsvg-introspect.vcxproj \ - rsvg-view-3.vcxproj \ - rsvg-view-3.vcxproj.filters \ - README.txt \ - $(GENERATED_ITEMS) - -rsvg-install.props: $(top_srcdir)/build/win32/vs10/rsvg-install.propsin rsvg.vs10.headers - -$(RM) $(top_builddir)/build/win32/vs11/rsvg-install.props - -$(RM) $(top_builddir)/build/win32/vs12/rsvg-install.props - -$(RM) $(top_builddir)/build/win32/vs14/rsvg-install.props - -$(RM) $(top_builddir)/build/win32/vs15/rsvg-install.props - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/rsvg-install.propsin >$@ - $(RM) rsvg.vs10.headers - -math.h: $(top_srcdir)/build/win32/vs9/math.h - cp $< $@ - -DISTCLEANFILES = $(GENERATED_ITEMS) - --include $(top_srcdir)/git.mk diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt deleted file mode 100644 index 054e3c55e..000000000 --- a/build/win32/vs10/README.txt +++ /dev/null @@ -1,74 +0,0 @@ -Note that all this is rather experimental. - -Please do not compile librsvg in a path with spaces to avoid potential -problems during the build and/or during the usage of the librsvg -library. - -Please refer to the following GNOME Live! page for more detailed -instructions on building librsvg and its dependencies with Visual C++: - -https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack - -This VS10 solution and the projects it includes are intented to be used -in a librsvg source tree unpacked from a tarball. In a git checkout you -first need to use some Unix-like environment or manual work to expand -files as needed, for instance the .vcprojin files here into .vcproj -files. - -It is recommended that GLib, libxml2, libcroco, Cairo, Pango is compiled -with VS10 to compile librsvg. - -External dependencies are at least Cairo, GLib, libxml2, libcroco, GDK-Pixbuf -Please see the build\win32\vs10\README.txt file in glib for details where to -unpack them. - -It is recommended that one builds the dependencies with VS10 as far as -possible, especially those from and using the GTK+ stack (i.e. GDK-Pixbuf, -Pango, GLib and Cairo), so that crashes caused by mixing calls to different -CRTs can be kept at a minimum. - -libxml2 and Cairo do contain support for compiling under VS10 -using VS project files and/or makefiles at this time of writing. -For GDK-Pixbuf, Pango, libcroco and GLib, VS10 project files are -available under $(srcroot)\build\vs10. - -Set up the source tree as follows under some arbitrary top folder -: - -\ -\vs10\ - -Note: put the resulting Cairo and libxml2 files as follows: - .dll files: \vs10\\bin - .lib files: \vs10\\lib - .h files: \vs10\\include - -The recommended build order for these dependencies: --libxml2 --(optional for GLib) PCRE (version 8.12 or later, use of CMake to - build PCRE is recommended-see build\win32\vs10\README.txt of GLib) --GLib (put the sources in \, and build it from - there with VS10) --libcroco --Cairo --Pango --Gdk-Pixbuf --ATK and GTK (Version 3.10+, if building the GTK+ viewer program) - -*this* file you are now reading is thus located at -\\build\win32\vs10\README.txt. - - is either Win32 or x64, as in VS10 project files. - -The "install" project will copy build results and headers into their -appropriate location under \vs10\. For instance, -built DLLs go into \vs10\\bin, built LIBs into -\vs10\\lib and headers into -\vs10\\include\librsvg-2.0. This is then from where -project files higher in the stack are supposed to look for them, not -from a specific librsvg source tree like this one. It is important to -keep separate the concept of a "source tree", where also non-public -headers are present, and an "install tree" where only public headers -are present. - ---Updated by Fan, Chun-wei diff --git a/build/win32/vs10/libpixbufloader-svg.vcxproj b/build/win32/vs10/libpixbufloader-svg.vcxproj deleted file mode 100644 index 6b14cd7fe..000000000 --- a/build/win32/vs10/libpixbufloader-svg.vcxproj +++ /dev/null @@ -1,179 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {F0CCC693-1721-4DBD-9A64-591201A22740} - libpixbufloadersvg - Win32Proj - - - - DynamicLibrary - v100 - MultiByte - true - - - DynamicLibrary - v100 - MultiByte - - - DynamicLibrary - v100 - MultiByte - true - - - DynamicLibrary - v100 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - - - false - - - - Disabled - %(AdditionalIncludeDirectories) - _DEBUG;$(RsvgPixbufLoaderCFlags);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue - - - %(AdditionalDependencies) - true - Windows - MachineX86 - - - - - MaxSpeed - true - %(AdditionalIncludeDirectories) - $(RsvgPixbufLoaderCFlags);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Windows - true - true - MachineX86 - - - - - X64 - - - Disabled - %(AdditionalIncludeDirectories) - _DEBUG;$(RsvgPixbufLoaderCFlags);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Windows - MachineX64 - - - - - X64 - - - MaxSpeed - true - %(AdditionalIncludeDirectories) - $(RsvgPixbufLoaderCFlags);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Windows - true - true - MachineX64 - - - - - - - - {3d7ef762-d969-4ac0-ab52-3cc86fa4620b} - false - - - - - - diff --git a/build/win32/vs10/libpixbufloader-svg.vcxproj.filters b/build/win32/vs10/libpixbufloader-svg.vcxproj.filters deleted file mode 100644 index bf12661b7..000000000 --- a/build/win32/vs10/libpixbufloader-svg.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Sources - - diff --git a/build/win32/vs10/librsvg.sln b/build/win32/vs10/librsvg.sln deleted file mode 100644 index 7a227c183..000000000 --- a/build/win32/vs10/librsvg.sln +++ /dev/null @@ -1,72 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg", "rsvg.vcxproj", "{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-convert", "rsvg-convert.vcxproj", "{039282C3-B73E-4D08-9B65-2034CF9EB4B7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-view-3", "rsvg-view-3.vcxproj", "{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpixbufloader-svg", "libpixbufloader-svg.vcxproj", "{F0CCC693-1721-4DBD-9A64-591201A22740}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-install", "rsvg-install.vcxproj", "{C416ED91-E000-49D3-9617-CCC473E08EAE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-introspect", "rsvg-introspect.vcxproj", "{E827A7D5-EA7A-4239-91A3-5EC76A0E7249}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|Win32.ActiveCfg = Debug|Win32 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|Win32.Build.0 = Debug|Win32 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|x64.ActiveCfg = Debug|x64 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|x64.Build.0 = Debug|x64 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|Win32.ActiveCfg = Release|Win32 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|Win32.Build.0 = Release|Win32 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|x64.ActiveCfg = Release|x64 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|x64.Build.0 = Release|x64 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|Win32.ActiveCfg = Debug|Win32 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|Win32.Build.0 = Debug|Win32 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|x64.ActiveCfg = Debug|x64 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|x64.Build.0 = Debug|x64 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|Win32.ActiveCfg = Release|Win32 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|Win32.Build.0 = Release|Win32 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|x64.ActiveCfg = Release|x64 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|x64.Build.0 = Release|x64 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|Win32.Build.0 = Debug|Win32 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|x64.ActiveCfg = Debug|x64 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|x64.Build.0 = Debug|x64 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|Win32.ActiveCfg = Release|Win32 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|Win32.Build.0 = Release|Win32 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|x64.ActiveCfg = Release|x64 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|x64.Build.0 = Release|x64 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|Win32.ActiveCfg = Debug|Win32 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|Win32.Build.0 = Debug|Win32 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|x64.ActiveCfg = Debug|x64 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|x64.Build.0 = Debug|x64 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Release|Win32.ActiveCfg = Release|Win32 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Release|Win32.Build.0 = Release|Win32 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Release|x64.ActiveCfg = Release|x64 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Release|x64.Build.0 = Release|x64 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|Win32.Build.0 = Debug|Win32 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|x64.ActiveCfg = Debug|x64 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|x64.Build.0 = Debug|x64 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|Win32.ActiveCfg = Release|Win32 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|Win32.Build.0 = Release|Win32 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|x64.ActiveCfg = Release|x64 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|x64.Build.0 = Release|x64 - {E827A7D5-EA7A-4239-91A3-5EC76A0E7249}.Debug|Win32.ActiveCfg = Debug|Win32 - {E827A7D5-EA7A-4239-91A3-5EC76A0E7249}.Release|Win32.ActiveCfg = Release|Win32 - {E827A7D5-EA7A-4239-91A3-5EC76A0E7249}.Debug|x64.ActiveCfg = Debug|x64 - {E827A7D5-EA7A-4239-91A3-5EC76A0E7249}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/win32/vs10/rsvg-build-defines.props b/build/win32/vs10/rsvg-build-defines.props deleted file mode 100644 index 54071c2ca..000000000 --- a/build/win32/vs10/rsvg-build-defines.props +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - G_LOG_DOMAIN="librsvg";RSVG_DISABLE_DEPRECATION_WARNINGS;RSVG_COMPILATION - $(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\libcroco-0.6;$(GlibEtcInstallRoot)\include\libxml2;.\ - pangocairo-1.0.lib;pango-1.0.lib;croco-0.6.lib;libxml2.lib - intl.lib - $(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(LibRsvgIncPath) - gtk-3.0.lib;gdk-3.0.lib - GDK_PIXBUF_ENABLE_BACKEND;G_LOG_DOMAIN="libpixbufloader-svg" - cd .. -set VCInstallDir=$(VCInstallDir) -nmake -f rsvg-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot) - $(SolutionDir)\..\Rsvg-2.0.gir;$(SolutionDir)\..\Rsvg-2.0.typelib - - - <_PropertySheetDisplayName>rsvgbuilddefinesprops - $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - - - - ..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) - HAVE_CONFIG_H;%(PreprocessorDefinitions) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - true - /d2Zi+ %(AdditionalOptions) - - - gdk_pixbuf-2.0.lib;gio-2.0.lib;gobject-2.0.lib;glib-2.0.lib;cairo.lib;%(AdditionalDependencies) - $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - - - - - $(LibRsvgCFlags) - - - $(LibRsvgIncPath) - - - $(LibRsvgLibs) - - - $(IntlLib) - - - $(Gtk3Libs) - - - $(RsvgPixbufLoaderCFlags) - - - $(RsvgIntrospectNMakeCmd) - - - $(RsvgIntrospectBuiltFiles) - - - diff --git a/build/win32/vs10/rsvg-convert.vcxproj.filtersin b/build/win32/vs10/rsvg-convert.vcxproj.filtersin deleted file mode 100644 index 49ab959ea..000000000 --- a/build/win32/vs10/rsvg-convert.vcxproj.filtersin +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - -#include "rsvg-convert.vs10.sourcefiles.filters" - - diff --git a/build/win32/vs10/rsvg-convert.vcxprojin b/build/win32/vs10/rsvg-convert.vcxprojin deleted file mode 100644 index 6d8c9a1e6..000000000 --- a/build/win32/vs10/rsvg-convert.vcxprojin +++ /dev/null @@ -1,174 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {039282C3-B73E-4D08-9B65-2034CF9EB4B7} - rsvgconvert - Win32Proj - - - - Application - v100 - MultiByte - true - - - Application - v100 - MultiByte - - - Application - v100 - MultiByte - true - - - Application - v100 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - - - false - - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue - - - $(IntlLib);%(AdditionalDependencies) - true - Console - MachineX86 - - - - - MaxSpeed - true - MultiThreadedDLL - true - - Level3 - ProgramDatabase - - - $(IntlLib);%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - X64 - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - ProgramDatabase - - - $(IntlLib);%(AdditionalDependencies) - true - Console - MachineX64 - - - - - X64 - - - MaxSpeed - true - MultiThreadedDLL - true - - Level3 - ProgramDatabase - - - $(IntlLib);%(AdditionalDependencies) - true - Console - true - true - MachineX64 - - - - -#include "rsvg-convert.vs10.sourcefiles" - - - - {3d7ef762-d969-4ac0-ab52-3cc86fa4620b} - false - - - - - - diff --git a/build/win32/vs10/rsvg-gen-srcs.props b/build/win32/vs10/rsvg-gen-srcs.props deleted file mode 100644 index ac961e16f..000000000 --- a/build/win32/vs10/rsvg-gen-srcs.props +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - copy ..\..\..\config.h.win32 ..\..\..\config.h - -echo EXPORTS > $(DefDir)\rsvg.def -cl /EP ..\..\..\rsvg.symbols >> $(DefDir)\rsvg.def - - - - <_PropertySheetDisplayName>rsvggensrcsprops - - - - - $(CopyConfigH) - - - $(GenerateRsvgDef) - - - diff --git a/build/win32/vs10/rsvg-install.propsin b/build/win32/vs10/rsvg-install.propsin deleted file mode 100644 index 998b4e595..000000000 --- a/build/win32/vs10/rsvg-install.propsin +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - -mkdir $(CopyDir) -mkdir $(CopyDir)\bin - -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\$(RsvgDllPrefix)rsvg$(RsvgDllSuffix).dll $(CopyDir)\bin -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\$(RsvgDllPrefix)rsvg$(RsvgDllSuffix).pdb $(CopyDir)\bin -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-convert.exe $(CopyDir)\bin -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-convert.pdb $(CopyDir)\bin -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-view-3.exe $(CopyDir)\bin -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-view-3.pdb $(CopyDir)\bin - -mkdir $(CopyDir)\include\librsvg-$(ApiVersion)\librsvg -#include "rsvg.vs10.headers" - -mkdir $(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-$(ApiVersion).lib $(CopyDir)\lib -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\libpixbufloader-svg.dll $(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\libpixbufloader-svg.pdb $(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders - -if exist ..\librsvg-2.0.pc copy ..\librsvg-2.0.pc $(CopyDir)\lib\pkgconfig - - $(GlibEtcInstallRoot)\bin\gdk-pixbuf-query-loaders.exe > $(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache - ..\librsvg-2.0.pc - (if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonDir)\python.exe $(PythonDir)\python.exe ..\rsvgpc.py --prefix=$(CopyDir) --version=$(RsvgMajorVersion).$(RsvgMinorVersion).$(RsvgMicroVersion)) - (if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonDirX64)\python.exe $(PythonDirX64)\python.exe ..\rsvgpc.py --prefix=$(CopyDir) --version=$(RsvgMajorVersion).$(RsvgMinorVersion).$(RsvgMicroVersion)) - - - <_PropertySheetDisplayName>rsvginstallprops - - - - - $(RsvgDoInstall) - - - $(RsvgPostInstall) - - - $(RsvgPCFiles) - - - $(RsvgGenPC) - - - $(RsvgGenPCX64) - - - diff --git a/build/win32/vs10/rsvg-install.vcxproj b/build/win32/vs10/rsvg-install.vcxproj deleted file mode 100644 index 6719dbe31..000000000 --- a/build/win32/vs10/rsvg-install.vcxproj +++ /dev/null @@ -1,115 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C416ED91-E000-49D3-9617-CCC473E08EAE} - rsvginstall - - - - Utility - v100 - MultiByte - true - - - Utility - v100 - MultiByte - - - Utility - v100 - MultiByte - true - - - Utility - v100 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copying Build Results... - $(RsvgPCFiles) - $(RsvgDoInstall)$(RsvgPostInstall) - install_placeholder;%(Outputs) - Copying Build Results... - $(RsvgPCFiles) - $(RsvgDoInstall)$(RsvgPostInstall) - install_placeholder;%(Outputs) - - - Generating .pc file... - $(RsvgGenPC) - $(RsvgGenPCX64) - $(RsvgPCFiles);%(Outputs) - - - - - {f0ccc693-1721-4dbd-9a64-591201a22740} - false - - - {039282c3-b73e-4d08-9b65-2034cf9eb4b7} - false - - - {2c4fc5fd-1cf0-47f9-83fc-a129ee313c1e} - false - - - {3d7ef762-d969-4ac0-ab52-3cc86fa4620b} - false - - - - - - diff --git a/build/win32/vs10/rsvg-install.vcxproj.filters b/build/win32/vs10/rsvg-install.vcxproj.filters deleted file mode 100644 index 636c2ab65..000000000 --- a/build/win32/vs10/rsvg-install.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Resource Files - Resource Files - - diff --git a/build/win32/vs10/rsvg-introspect.vcxproj b/build/win32/vs10/rsvg-introspect.vcxproj deleted file mode 100644 index c29b956d9..000000000 --- a/build/win32/vs10/rsvg-introspect.vcxproj +++ /dev/null @@ -1,103 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {E827A7D5-EA7A-4239-91A3-5EC76A0E7249} - rsvgintrospect - - - - Makefile - true - MultiByte - v100 - - - Makefile - false - true - MultiByte - v100 - - - Makefile - MultiByte - v100 - - - Makefile - MultiByte - true - v100 - - - - - - - - - - - - - - - - - - - - - - - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParam) clean - $(RsvgIntrospectBuiltFiles) - - - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParam) clean - $(RsvgIntrospectBuiltFiles) - - - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean - $(RsvgIntrospectBuiltFiles) - - - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection - $(RsvgIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean - $(RsvgIntrospectBuiltFiles) - - - - {c416ed91-e000-49d3-9617-ccc473e08eae} - false - - - - - - \ No newline at end of file diff --git a/build/win32/vs10/rsvg-version-paths.props.in b/build/win32/vs10/rsvg-version-paths.props.in deleted file mode 100644 index 18aca67fc..000000000 --- a/build/win32/vs10/rsvg-version-paths.props.in +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - @LIBRSVG_MAJOR_VERSION@ - @LIBRSVG_MINOR_VERSION@ - @LIBRSVG_MICRO_VERSION@ - 2.0 - 10 - $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) - $(GlibEtcInstallRoot) - $(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName) - lib - -$(ApiVersion)-0 - - -$(ApiVersion)-vs$(VSVer) - $(RsvgSeparateVSDllPrefix) - $(RsvgSeparateVSDllSuffix) - c:\python34 - c:\python34 - c:\python34 - c:\python36 - c:\python36 - $(PythonDir).x64 - PYTHON=$(PythonDir)\python.exe - PYTHON=$(PythonDirX64)\python.exe - - - <_PropertySheetDisplayName>rsvgversionpathsprops - - - - - $(RsvgMajorVersion) - - - $(RsvgMinorVersion) - - - $(RsvgMicroVersion) - - - $(ApiVersion) - - - $(VSVer) - - - $(GlibEtcInstallRoot) - - - $(CopyDir) - - - $(DefDir) - - - $(RsvgLibtoolCompatibleDllPrefix) - - - $(RsvgLibtoolCompatibleDllSuffix) - - - $(RsvgSeparateVSDllPrefix) - - - $(RsvgSeparateVSDllSuffix) - - - $(RsvgDllPrefix) - - - $(RsvgDllSuffix) - - - $(PythonDir) - - - $(PythonDirX64) - - - $(IntrospectPythonParam) - - - $(IntrospectPythonParamX64) - - - diff --git a/build/win32/vs10/rsvg-view-3.vcxproj b/build/win32/vs10/rsvg-view-3.vcxproj deleted file mode 100644 index 11092bd78..000000000 --- a/build/win32/vs10/rsvg-view-3.vcxproj +++ /dev/null @@ -1,177 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E} - rsvgview3 - Win32Proj - - - - Application - v100 - MultiByte - true - - - Application - v100 - MultiByte - - - Application - v100 - MultiByte - true - - - Application - v100 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - - - false - - - - Disabled - $(Gtk3IncPath);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue - - - $(Gtk3Libs);%(AdditionalDependencies) - true - Console - MachineX86 - - - - - MaxSpeed - true - $(Gtk3IncPath);%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - - - $(Gtk3Libs);%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - X64 - - - Disabled - $(Gtk3IncPath);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - ProgramDatabase - - - $(Gtk3Libs);%(AdditionalDependencies) - true - Console - MachineX64 - - - - - X64 - - - MaxSpeed - true - $(Gtk3IncPath);%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - - - $(Gtk3Libs);%(AdditionalDependencies) - true - Console - true - true - MachineX64 - - - - - - - - {3d7ef762-d969-4ac0-ab52-3cc86fa4620b} - false - - - - - - diff --git a/build/win32/vs10/rsvg-view-3.vcxproj.filters b/build/win32/vs10/rsvg-view-3.vcxproj.filters deleted file mode 100644 index 2eabdd648..000000000 --- a/build/win32/vs10/rsvg-view-3.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Sources - - diff --git a/build/win32/vs10/rsvg.vcxproj.filtersin b/build/win32/vs10/rsvg.vcxproj.filtersin deleted file mode 100644 index 804d5b04b..000000000 --- a/build/win32/vs10/rsvg.vcxproj.filtersin +++ /dev/null @@ -1,24 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - -#include "rsvg.vs10.sourcefiles.filters" - - - Resource Files - Resource Files - - diff --git a/build/win32/vs10/rsvg.vcxprojin b/build/win32/vs10/rsvg.vcxprojin deleted file mode 100644 index 8bdc079a9..000000000 --- a/build/win32/vs10/rsvg.vcxprojin +++ /dev/null @@ -1,219 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B} - rsvg - Win32Proj - - - - DynamicLibrary - v100 - MultiByte - true - - - DynamicLibrary - v100 - MultiByte - - - DynamicLibrary - v100 - MultiByte - true - - - DynamicLibrary - v100 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - - - false - - - - Disabled - $(LibRsvgIncPath);%(AdditionalIncludeDirectories) - _DEBUG;$(LibRsvgCFlags);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue - - - $(LibRsvgLibs);%(AdditionalDependencies) - $(OutDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).dll - $(IntDir)$(ProjectName).def - true - $(TargetDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).pdb - Windows - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - MachineX86 - - - - - MaxSpeed - true - $(LibRsvgIncPath);%(AdditionalIncludeDirectories) - $(LibRsvgCFlags);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - - - $(LibRsvgLibs);%(AdditionalDependencies) - $(OutDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).dll - $(IntDir)$(ProjectName).def - true - $(TargetDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).pdb - Windows - true - true - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - MachineX86 - - - - - X64 - - - Disabled - $(LibRsvgIncPath);%(AdditionalIncludeDirectories) - _DEBUG;$(LibRsvgCFlags);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - ProgramDatabase - - - $(LibRsvgLibs);%(AdditionalDependencies) - $(OutDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).dll - $(IntDir)$(ProjectName).def - true - $(TargetDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).pdb - Windows - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - MachineX64 - - - - - X64 - - - MaxSpeed - true - $(LibRsvgIncPath);%(AdditionalIncludeDirectories) - $(LibRsvgCFlags);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - - - $(LibRsvgLibs);%(AdditionalDependencies) - $(OutDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).dll - $(IntDir)$(ProjectName).def - true - $(TargetDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).pdb - Windows - true - true - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - MachineX64 - - - -#include "rsvg.vs10.sourcefiles" - - - - Copying config.h... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - - - Generating $(ProjectName).def... - $(GenerateRsvgDef) - $(IntDir)$(ProjectName).def;%(Outputs) - Generating $(ProjectName).def... - $(GenerateRsvgDef) - $(IntDir)$(ProjectName).def;%(Outputs) - Generating $(ProjectName).def... - $(GenerateRsvgDef) - $(IntDir)$(ProjectName).def;%(Outputs) - Generating $(ProjectName).def... - $(GenerateRsvgDef) - $(IntDir)$(ProjectName).def;%(Outputs) - - - - - - diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am deleted file mode 100644 index be2bcdc13..000000000 --- a/build/win32/vs11/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -EXTRA_DIST = \ - librsvg.sln \ - rsvg-build-defines.props \ - rsvg-gen-srcs.props \ - rsvg-install.props \ - rsvg-version-paths.props \ - libpixbufloader-svg.vcxproj \ - libpixbufloader-svg.vcxproj.filters \ - rsvg.vcxproj \ - rsvg.vcxproj.filters \ - rsvg-convert.vcxproj \ - rsvg-convert.vcxproj.filters \ - rsvg-install.vcxproj \ - rsvg-install.vcxproj.filters \ - rsvg-introspect.vcxproj \ - rsvg-view-3.vcxproj \ - rsvg-view-3.vcxproj.filters \ - README.txt \ - math.h - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_VER = 11 -MSVC_FORMAT_VER = 12 -MSVC_VER_LONG = 2012 - -include $(top_srcdir)/build/Makefile-newvs.am - -math.h: $(top_srcdir)/build/win32/vs9/math.h - cp $< $@ diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am deleted file mode 100644 index 35a209c11..000000000 --- a/build/win32/vs12/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -EXTRA_DIST = \ - librsvg.sln \ - rsvg-build-defines.props \ - rsvg-gen-srcs.props \ - rsvg-install.props \ - rsvg-version-paths.props \ - libpixbufloader-svg.vcxproj \ - libpixbufloader-svg.vcxproj.filters \ - rsvg.vcxproj \ - rsvg.vcxproj.filters \ - rsvg-convert.vcxproj \ - rsvg-convert.vcxproj.filters \ - rsvg-install.vcxproj \ - rsvg-install.vcxproj.filters \ - rsvg-introspect.vcxproj \ - rsvg-view-3.vcxproj \ - rsvg-view-3.vcxproj.filters \ - README.txt - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_VER = 12 -MSVC_FORMAT_VER = 12 -MSVC_VER_LONG = 2013 - -include $(top_srcdir)/build/Makefile-newvs.am diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am deleted file mode 100644 index e7cd9e1aa..000000000 --- a/build/win32/vs14/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -EXTRA_DIST = \ - librsvg.sln \ - rsvg-build-defines.props \ - rsvg-gen-srcs.props \ - rsvg-install.props \ - rsvg-version-paths.props \ - libpixbufloader-svg.vcxproj \ - libpixbufloader-svg.vcxproj.filters \ - rsvg.vcxproj \ - rsvg.vcxproj.filters \ - rsvg-convert.vcxproj \ - rsvg-convert.vcxproj.filters \ - rsvg-install.vcxproj \ - rsvg-install.vcxproj.filters \ - rsvg-introspect.vcxproj \ - rsvg-view-3.vcxproj \ - rsvg-view-3.vcxproj.filters \ - README.txt - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_VER = 14 -MSVC_FORMAT_VER = 12 -MSVC_VER_LONG = 14 - -include $(top_srcdir)/build/Makefile-newvs.am diff --git a/build/win32/vs15/Makefile.am b/build/win32/vs15/Makefile.am deleted file mode 100644 index 566e41a63..000000000 --- a/build/win32/vs15/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -EXTRA_DIST = \ - librsvg.sln \ - rsvg-build-defines.props \ - rsvg-gen-srcs.props \ - rsvg-install.props \ - rsvg-version-paths.props \ - libpixbufloader-svg.vcxproj \ - libpixbufloader-svg.vcxproj.filters \ - rsvg.vcxproj \ - rsvg.vcxproj.filters \ - rsvg-convert.vcxproj \ - rsvg-convert.vcxproj.filters \ - rsvg-install.vcxproj \ - rsvg-install.vcxproj.filters \ - rsvg-introspect.vcxproj \ - rsvg-view-3.vcxproj \ - rsvg-view-3.vcxproj.filters \ - README.txt - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_VER = 15 -MSVC_FORMAT_VER = 12 -MSVC_VER_LONG = 15 -MSVC_TOOLSET = 141 - -include $(top_srcdir)/build/Makefile-newvs.am diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am deleted file mode 100644 index dba249f77..000000000 --- a/build/win32/vs9/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -GENERATED_ITEMS = \ - rsvg.vcproj \ - rsvg-convert.vcproj \ - rsvg-install.vsprops - -EXTRA_DIST = \ - librsvg.sln \ - rsvg-build-defines.vsprops \ - rsvg-gen-srcs.vsprops \ - rsvg-install.vspropsin \ - rsvg-version-paths.vsprops \ - libpixbufloader-svg.vcproj \ - rsvg.vcprojin \ - rsvg-convert.vcprojin \ - rsvg-install.vcproj \ - rsvg-introspect.vcproj \ - rsvg-view-3.vcproj \ - README.txt \ - math.h \ - $(GENERATED_ITEMS) - -rsvg-install.vsprops: $(top_srcdir)/build/win32/vs9/rsvg-install.vspropsin rsvg.headers - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/rsvg-install.vspropsin >$@ - rm rsvg.headers - -DISTCLEANFILES = $(GENERATED_ITEMS) - --include $(top_srcdir)/git.mk diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt deleted file mode 100644 index 333e58e9d..000000000 --- a/build/win32/vs9/README.txt +++ /dev/null @@ -1,74 +0,0 @@ -Note that all this is rather experimental. - -Please do not compile librsvg in a path with spaces to avoid potential -problems during the build and/or during the usage of the librsvg -library. - -Please refer to the following GNOME Live! page for more detailed -instructions on building librsvg and its dependencies with Visual C++: - -https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack - -This VS9 solution and the projects it includes are intented to be used -in a librsvg source tree unpacked from a tarball. In a git checkout you -first need to use some Unix-like environment or manual work to expand -files as needed, for instance the .vcprojin files here into .vcproj -files. - -It is recommended that GLib, libxml2, libcroco, Cairo, Pango is compiled -with VS9 to compile librsvg. - -External dependencies are at least Cairo, GLib, libxml2, libcroco, GDK-Pixbuf -Please see the build\win32\vs9\README.txt file in glib for details where to -unpack them. - -It is recommended that one builds the dependencies with VS9 as far as -possible, especially those from and using the GTK+ stack (i.e. GDK-Pixbuf, -Pango, GLib and Cairo), so that crashes caused by mixing calls to different -CRTs can be kept at a minimum. - -libxml2 and Cairo do contain support for compiling under VS9 -using VS project files and/or makefiles at this time of writing. -For GDK-Pixbuf, Pango, libcroco and GLib, VS9 project files are -available under $(srcroot)\build\vs9. - -Set up the source tree as follows under some arbitrary top folder -: - -\ -\vs9\ - -Note: put the resulting Cairo and libxml2 files as follows: - .dll files: \vs9\\bin - .lib files: \vs9\\lib - .h files: \vs9\\include - -The recommended build order for these dependencies: --libxml2 --(optional for GLib) PCRE (version 8.12 or later, use of CMake to - build PCRE is recommended-see build\win32\vs9\README.txt of GLib) --GLib (put the sources in \, and build it from - there with VS9) --libcroco --Cairo --Pango --Gdk-Pixbuf --ATK and GTK (Version 3.10+, if building the GTK+ viewer program) - -*this* file you are now reading is thus located at -\\build\win32\vs9\README.txt. - - is either Win32 or x64, as in VS9 project files. - -The "install" project will copy build results and headers into their -appropriate location under \vs9\. For instance, -built DLLs go into \vs9\\bin, built LIBs into -\vs9\\lib and headers into -\vs9\\include\librsvg-2.0. This is then from where -project files higher in the stack are supposed to look for them, not -from a specific librsvg source tree like this one. It is important to -keep separate the concept of a "source tree", where also non-public -headers are present, and an "install tree" where only public headers -are present. - ---Updated by Fan, Chun-wei diff --git a/build/win32/vs9/libpixbufloader-svg.vcproj b/build/win32/vs9/libpixbufloader-svg.vcproj deleted file mode 100644 index 8ca02b11f..000000000 --- a/build/win32/vs9/libpixbufloader-svg.vcproj +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/librsvg.sln b/build/win32/vs9/librsvg.sln deleted file mode 100644 index 84b58f01d..000000000 --- a/build/win32/vs9/librsvg.sln +++ /dev/null @@ -1,90 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg", "rsvg.vcproj", "{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-convert", "rsvg-convert.vcproj", "{039282C3-B73E-4D08-9B65-2034CF9EB4B7}" - ProjectSection(ProjectDependencies) = postProject - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B} = {3D7EF762-D969-4AC0-AB52-3CC86FA4620B} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-view-3", "rsvg-view-3.vcproj", "{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}" - ProjectSection(ProjectDependencies) = postProject - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B} = {3D7EF762-D969-4AC0-AB52-3CC86FA4620B} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpixbufloader-svg", "libpixbufloader-svg.vcproj", "{F0CCC693-1721-4DBD-9A64-591201A22740}" - ProjectSection(ProjectDependencies) = postProject - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B} = {3D7EF762-D969-4AC0-AB52-3CC86FA4620B} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-install", "rsvg-install.vcproj", "{C416ED91-E000-49D3-9617-CCC473E08EAE}" - ProjectSection(ProjectDependencies) = postProject - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B} = {3D7EF762-D969-4AC0-AB52-3CC86FA4620B} - {F0CCC693-1721-4DBD-9A64-591201A22740} = {F0CCC693-1721-4DBD-9A64-591201A22740} - {039282C3-B73E-4D08-9B65-2034CF9EB4B7} = {039282C3-B73E-4D08-9B65-2034CF9EB4B7} - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E} = {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-introspect", "rsvg-introspect.vcproj", "{E827A7D5-EA7A-4239-91A3-5EC76A0E7249}" - ProjectSection(ProjectDependencies) = postProject - {C416ED91-E000-49D3-9617-CCC473E08EAE} = {C416ED91-E000-49D3-9617-CCC473E08EAE} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|Win32.ActiveCfg = Debug|Win32 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|Win32.Build.0 = Debug|Win32 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|x64.ActiveCfg = Debug|x64 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|x64.Build.0 = Debug|x64 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|Win32.ActiveCfg = Release|Win32 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|Win32.Build.0 = Release|Win32 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|x64.ActiveCfg = Release|x64 - {3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|x64.Build.0 = Release|x64 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|Win32.ActiveCfg = Debug|Win32 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|Win32.Build.0 = Debug|Win32 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|x64.ActiveCfg = Debug|x64 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|x64.Build.0 = Debug|x64 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|Win32.ActiveCfg = Release|Win32 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|Win32.Build.0 = Release|Win32 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|x64.ActiveCfg = Release|x64 - {039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|x64.Build.0 = Release|x64 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|Win32.Build.0 = Debug|Win32 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|x64.ActiveCfg = Debug|x64 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|x64.Build.0 = Debug|x64 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|Win32.ActiveCfg = Release|Win32 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|Win32.Build.0 = Release|Win32 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|x64.ActiveCfg = Release|x64 - {2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|x64.Build.0 = Release|x64 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|Win32.ActiveCfg = Debug|Win32 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|Win32.Build.0 = Debug|Win32 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|x64.ActiveCfg = Debug|x64 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|x64.Build.0 = Debug|x64 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Release|Win32.ActiveCfg = Release|Win32 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Release|Win32.Build.0 = Release|Win32 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Release|x64.ActiveCfg = Release|x64 - {F0CCC693-1721-4DBD-9A64-591201A22740}.Release|x64.Build.0 = Release|x64 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|Win32.Build.0 = Debug|Win32 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|x64.ActiveCfg = Debug|x64 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|x64.Build.0 = Debug|x64 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|Win32.ActiveCfg = Release|Win32 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|Win32.Build.0 = Release|Win32 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|x64.ActiveCfg = Release|x64 - {C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|x64.Build.0 = Release|x64 - {E827A7D5-EA7A-4239-91A3-5EC76A0E7249}.Debug|Win32.ActiveCfg = Debug|Win32 - {E827A7D5-EA7A-4239-91A3-5EC76A0E7249}.Release|Win32.ActiveCfg = Release|Win32 - {E827A7D5-EA7A-4239-91A3-5EC76A0E7249}.Debug|x64.ActiveCfg = Debug|x64 - {E827A7D5-EA7A-4239-91A3-5EC76A0E7249}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/win32/vs9/math.h b/build/win32/vs9/math.h deleted file mode 100644 index f4f0c89d1..000000000 --- a/build/win32/vs9/math.h +++ /dev/null @@ -1,39 +0,0 @@ -/* librsvg - SVG rendering library - * Copyright (C) 2015 Chun-wei Fan - * - * Author: Chun-wei Fan - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#include - -/* include the system's math.h */ -#include <../include/math.h> -#include - -#if (_MSC_VER < 1800) -/* it seems of the supported compilers only - * MSVC does not have isnan(), but it does - * have _isnan() which does the same as isnan() - */ -#ifndef __MSVC_ISNAN_FALLBACK__ -#define __MSVC_ISNAN_FALLBACK__ -static inline gboolean -isnan (double x) -{ - return _isnan (x); -} -#endif /* __MSVC_ISNAN_FALLBACK__ */ -#endif /* _MSC_VER < 1800 */ diff --git a/build/win32/vs9/rsvg-build-defines.vsprops b/build/win32/vs9/rsvg-build-defines.vsprops deleted file mode 100644 index fa26e7cb8..000000000 --- a/build/win32/vs9/rsvg-build-defines.vsprops +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - diff --git a/build/win32/vs9/rsvg-convert.vcprojin b/build/win32/vs9/rsvg-convert.vcprojin deleted file mode 100644 index 6ee5f0ca6..000000000 --- a/build/win32/vs9/rsvg-convert.vcprojin +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "rsvg-convert.sourcefiles" - - - - - - - - - diff --git a/build/win32/vs9/rsvg-gen-srcs.vsprops b/build/win32/vs9/rsvg-gen-srcs.vsprops deleted file mode 100644 index 851780b9f..000000000 --- a/build/win32/vs9/rsvg-gen-srcs.vsprops +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/build/win32/vs9/rsvg-install.vcproj b/build/win32/vs9/rsvg-install.vcproj deleted file mode 100644 index 733a213c2..000000000 --- a/build/win32/vs9/rsvg-install.vcproj +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/rsvg-install.vspropsin b/build/win32/vs9/rsvg-install.vspropsin deleted file mode 100644 index b5d9826b6..000000000 --- a/build/win32/vs9/rsvg-install.vspropsin +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - diff --git a/build/win32/vs9/rsvg-introspect.vcproj b/build/win32/vs9/rsvg-introspect.vcproj deleted file mode 100644 index 9705b9814..000000000 --- a/build/win32/vs9/rsvg-introspect.vcproj +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/rsvg-version-paths.vsprops.in b/build/win32/vs9/rsvg-version-paths.vsprops.in deleted file mode 100644 index b0dad2b13..000000000 --- a/build/win32/vs9/rsvg-version-paths.vsprops.in +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/rsvg-view-3.vcproj b/build/win32/vs9/rsvg-view-3.vcproj deleted file mode 100644 index 3c6abf0dc..000000000 --- a/build/win32/vs9/rsvg-view-3.vcproj +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/rsvg.vcprojin b/build/win32/vs9/rsvg.vcprojin deleted file mode 100644 index 86fdd99be..000000000 --- a/build/win32/vs9/rsvg.vcprojin +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "rsvg.sourcefiles" - - - - - - - - - - - - - - - - - - - - - diff --git a/config.h.win32.in b/config.h.win32.in deleted file mode 100644 index 7d4ee6b66..000000000 --- a/config.h.win32.in +++ /dev/null @@ -1,97 +0,0 @@ -/* config.h.win32.in. Manually Edited for Windows Builds. */ - -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you have the header file. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define HAVE_INTTYPES_H 1 -#endif - -/* Define if your file defines LC_MESSAGES. */ -/* #undef HAVE_LC_MESSAGES */ - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Have the pangoft2 library */ -/* #define HAVE_PANGOFT2 1 */ - -/* Define to 1 if you have the header file. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1600) -#define HAVE_STDINT_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_STRINGS_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strtok_r' function. */ -/* #undef HAVE_STRTOK_R */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_UNISTD_H 1 -#endif - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "@PACKAGE@" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "@PACKAGE_NAME@" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "@PACKAGE_NAME@ @PACKAGE_VERSION@" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "@PACKAGE_TARNAME@" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "@PACKAGE_VERSION@" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Version number of package */ -#define VERSION "@PACKAGE_VERSION@" - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif diff --git a/configure.ac b/configure.ac index f3d1510a4..3b1ebe869 100644 --- a/configure.ac +++ b/configure.ac @@ -298,17 +298,6 @@ tests/Makefile tools/Makefile doc/Makefile doc/version.xml -config.h.win32 -build/Makefile -build/win32/Makefile -build/win32/vs9/Makefile -build/win32/vs9/rsvg-version-paths.vsprops -build/win32/vs10/Makefile -build/win32/vs10/rsvg-version-paths.props -build/win32/vs11/Makefile -build/win32/vs12/Makefile -build/win32/vs14/Makefile -build/win32/vs15/Makefile ]) AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}.pc:librsvg.pc.in],[],[RSVG_API_VERSION=$RSVG_API_VERSION]) @@ -317,15 +306,11 @@ AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}-uninstalled.pc:librsvg-uninstalled. AC_OUTPUT dnl ============================================================================================= -echo " -librsvg-$VERSION - - prefix: ${prefix} - compiler: ${CC} - - Build introspectable bindings: ${found_introspection} - Build Vala bindings: ${enable_vala} - Build GdkPixbuf loader: ${enable_pixbuf_loader} - GTK+ $GTK3_REQUIRED or later: ${have_gtk_3} - Build miscellaneous tools: ${build_misc_tools} -" +printf '\nlibrsvg-og-%s\n\n' "$VERSION" +printf ' %-40s : %s\n' 'prefix' "$prefix" +printf ' %-40s : %s\n\n' 'compiler' "$CC" +printf ' %-40s : %s\n' 'Build introspectable bindings' "$found_introspection" +printf ' %-40s : %s\n' 'Build Vala bindings' "$enable_vala" +printf ' %-40s : %s\n' 'Build GdkPixbuf loader' "$enable_pixbuf_loader" +printf ' %-40s : %s\n' "GTK+ $GTK3_REQUIRED or later" "$have_gtk_3" +printf ' %-40s : %s\n\n' 'Build miscellaneous tools' "$build_misc_tools"