diff --git a/Makefile.am b/Makefile.am index 54f22ee6d..008ad5826 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ include $(top_srcdir)/glib.mk ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests -DIST_SUBDIRS = $(SUBDIRS) build +DIST_SUBDIRS = $(SUBDIRS) build win32 bin_SCRIPTS = glib-gettextize diff --git a/README.win32 b/README.win32 index 6e2d9daaa..fa6a3a016 100644 --- a/README.win32 +++ b/README.win32 @@ -191,15 +191,15 @@ information. Note that you will need a libintl implementation, zlib, and libFFI. If you are building from a GIT checkout, you will first need to use some -Unix-like environment or run build/win32/setup.py, +Unix-like environment or run win32/setup.py, which will expand the VS 2008/2010 project files, the DLL resouce files and -other miscellanious files required for the build. Run build/win32/setup.py +other miscellanious files required for the build. Run win32/setup.py as follows: -$python build/win32/setup.py --perl path_to_your_perl.exe +$python win32/setup.py --perl path_to_your_perl.exe for more usage on this script, run -$python build/win32/setup.py -h/--help +$python win32/setup.py -h/--help Building with MSVC and NMAKE ============================ diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am deleted file mode 100644 index 9fd89f95d..000000000 --- a/build/Makefile-newvs.am +++ /dev/null @@ -1,47 +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_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)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - sed 's/$(MSVC_BASE_VER_LONG)/$(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/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - sed 's/VS$(MSVC_BASE_VER)/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/vs$(MSVC_BASE_VER)/$@; then \ - sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi - -%.props: $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/Makefile - if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \ - sed 's/$(MSVC_BASE_VER)<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/$(MSVC_BASE_VER)<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi - -%.vcxproj.filters: - if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \ - cp $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - cp $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi diff --git a/build/Makefile.msvcproj b/build/Makefile.msvcproj deleted file mode 100644 index a4e93a5d0..000000000 --- a/build/Makefile.msvcproj +++ /dev/null @@ -1,154 +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 -# (the following 3 lines if headers need to be installed) -# 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 # 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)/build/win32/vs12/YourProject.vcxproj \ -# $(top_builddir)/build/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)/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 ' ' >>$(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 - -$(top_builddir)/build/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/build/win32/vs12/$(1).vcxproj - -$(top_builddir)/build/win32/vs12/$(1).vcxproj: Makefile - -$(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 ' ' >>$(1).vs12.sourcefiles && \ - echo ' Source Files' >>$(1).vs12.sourcefiles.filters \ - ;; \ - esac; \ - done - - $(CPP) -P - <$(top_srcdir)/build/win32/vs12/$(1).vcxprojin >$(top_builddir)/build/win32/vs12/$(1).vcxproj - $(CPP) -P - <$(top_srcdir)/build/win32/vs12/$(1).vcxproj.filtersin >$(top_builddir)/build/win32/vs12/$(1).vcxproj.filters - $(RM) $(1).vs12.sourcefiles - $(RM) $(1).vs12.sourcefiles.filters - -$(top_builddir)/build/win32/vs12/$(1).vs12.headers: Makefile - -$(RM) $(top_builddir)/build/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)/build/win32/vs12/$(1).vs12.headers \ - ;; \ - esac; \ - done - -endef - -$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am index 5c2dac8ed..2f701b063 100644 --- a/build/win32/Makefile.am +++ b/build/win32/Makefile.am @@ -1,14 +1,6 @@ SUBDIRS = \ - dirent \ - vs9 \ - vs10 \ - vs11 \ - vs12 \ - vs14 + dirent EXTRA_DIST = \ - glibpc.py \ make.msc \ - module.defs \ - pc_base.py \ - replace.py + module.defs diff --git a/build/win32/vs10/glib.vcxproj.filtersin b/build/win32/vs10/glib.vcxproj.filtersin deleted file mode 100644 index 853efb602..000000000 --- a/build/win32/vs10/glib.vcxproj.filtersin +++ /dev/null @@ -1,122 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {bb961775-fd45-4205-b1fd-901c3c8fd64c} - - - {f630c518-4c58-4dfa-ab43-5fa0b0eb10f1} - - - {9fef0e23-cf71-48aa-979b-7eb84df56143} - - - {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 "glib.vs10.sourcefiles.filters" - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\libcharset - - - Source Files\gnulib - - - Source Files\gnulib - - - Source Files\gnulib - - - Source Files\gnulib - - - Source Files\gnulib - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - Source Files\pcre - - - - Resource Files - Resource Files - - - - Resource Files - - - diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin deleted file mode 100644 index a7a9372dc..000000000 --- a/build/win32/vs10/glib.vcxprojin +++ /dev/null @@ -1,675 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Debug_BundledPCRE - Win32 - - - Debug_BundledPCRE - x64 - - - Release - Win32 - - - Release - x64 - - - Release_BundledPCRE - Win32 - - - Release_BundledPCRE - x64 - - - - {12BCA020-EABF-429E-876A-A476BC9C10C0} - glib - Win32Proj - - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - Debug\$(Platform)\bin\ - true - true - Debug\$(Platform)\bin\ - true - false - Release\$(Platform)\bin\ - false - false - Release\$(Platform)\bin\ - false - - - - Disabled - _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - CompileAsC - - - ws2_32.lib;winmm.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - false - - - MachineX86 - - - - - Disabled - _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - CompileAsC - - - ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - false - - - MachineX86 - - - - - Disabled - _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - false - - - MachineX64 - - - - - Disabled - _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - false - - - MachineX64 - - - - - $(GLibBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - false - - - MachineX86 - - - - - $(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - false - - - MachineX86 - - - - - $(GLibBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - false - - - MachineX64 - - - - - $(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - false - - - MachineX64 - - - -#include "glib.vs10.sourcefiles" - - - - - - $(LocalCharsetDefs);%(PreprocessorDefinitions) - $(LocalCharsetDefs);%(PreprocessorDefinitions) - $(LocalCharsetDefs);%(PreprocessorDefinitions) - $(LocalCharsetDefs);%(PreprocessorDefinitions) - $(LocalCharsetDefs);%(PreprocessorDefinitions) - $(LocalCharsetDefs);%(PreprocessorDefinitions) - $(LocalCharsetDefs);%(PreprocessorDefinitions) - $(LocalCharsetDefs);%(PreprocessorDefinitions) - - - - - - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - - - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\..\config.h;%(Outputs) - - - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\..\glib\glibconfig.h;%(Outputs) - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\..\glib\glibconfig.h;%(Outputs) - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\..\glib\glibconfig.h;%(Outputs) - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\..\glib\glibconfig.h;%(Outputs) - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\..\glib\glibconfig.h;%(Outputs) - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\..\glib\glibconfig.h;%(Outputs) - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\..\glib\glibconfig.h;%(Outputs) - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\..\glib\glibconfig.h;%(Outputs) - - - - - - - - - diff --git a/configure.ac b/configure.ac index 324178a3d..000130e1c 100644 --- a/configure.ac +++ b/configure.ac @@ -3434,13 +3434,14 @@ Makefile build/Makefile build/win32/Makefile build/win32/dirent/Makefile -build/win32/vs9/Makefile -build/win32/vs9/glib-version-paths.vsprops -build/win32/vs10/Makefile -build/win32/vs10/glib-version-paths.props -build/win32/vs11/Makefile -build/win32/vs12/Makefile -build/win32/vs14/Makefile +win32/Makefile +win32/vs9/Makefile +win32/vs9/glib-version-paths.vsprops +win32/vs10/Makefile +win32/vs10/glib-version-paths.props +win32/vs11/Makefile +win32/vs12/Makefile +win32/vs14/Makefile glib/Makefile glib/libcharset/Makefile glib/gnulib/Makefile diff --git a/gio/Makefile.am b/gio/Makefile.am index cbeeaa13c..1ca27fcb7 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -947,15 +947,15 @@ glib_compile_schemas_EXCLUDES = dummy gio_tool_FILES = $(gio_SOURCES) gio_tool_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ $(BUILT_EXTRA_DIST) \ - $(top_builddir)/build/win32/vs9/gio.vcproj \ - $(top_builddir)/build/win32/vs9/gio.headers \ - $(top_builddir)/build/win32/vs9/glib-compile-schemas.vcproj \ - $(top_builddir)/build/win32/vs9/glib-compile-resources.vcproj \ - $(top_builddir)/build/win32/vs9/gio-tool.vcproj + $(top_builddir)/win32/vs9/gio.vcproj \ + $(top_builddir)/win32/vs9/gio.headers \ + $(top_builddir)/win32/vs9/glib-compile-schemas.vcproj \ + $(top_builddir)/win32/vs9/glib-compile-resources.vcproj \ + $(top_builddir)/win32/vs9/gio-tool.vcproj files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ diff --git a/glib/Makefile.am b/glib/Makefile.am index 82a7d3a2a..2aeaddd1b 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -466,9 +466,9 @@ glib_HEADERS_DIR = $(glibsubincludedir) glib_HEADERS_INST = $(deprecatedinclude_HEADERS) $(glibsubinclude_HEADERS) glib_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj -dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/build/win32/vs9/glib.vcproj $(top_builddir)/build/win32/vs9/glib.headers +dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/win32/vs9/glib.vcproj $(top_builddir)/win32/vs9/glib.headers files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 948e86974..b12743cc1 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -242,9 +242,9 @@ gobject_HEADERS_DIR = $(libgobjectincludedir) gobject_HEADERS_INST = $(gobject_public_h_sources) gobject_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj -dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/build/win32/vs9/gobject.vcproj $(top_builddir)/build/win32/vs9/gobject.headers +dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/win32/vs9/gobject.vcproj $(top_builddir)/win32/vs9/gobject.headers files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am new file mode 100644 index 000000000..ecdf3b556 --- /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/$(MSVC_BASE_VER)<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/$(MSVC_BASE_VER)<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + fi + +%.vcxproj.filters: + if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ + cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + else \ + cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + fi diff --git a/win32/Makefile.am b/win32/Makefile.am new file mode 100644 index 000000000..44a6345ff --- /dev/null +++ b/win32/Makefile.am @@ -0,0 +1,6 @@ +SUBDIRS = vs9 vs10 vs11 vs12 vs14 + +EXTRA_DIST = \ + glibpc.py \ + pc_base.py \ + replace.py diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj new file mode 100644 index 000000000..2e96e12bc --- /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 +# 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 = ... # +# +# 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 ' ' >>$(1).sourcefiles && \ + echo ' ' >>$(1).vs10.sourcefiles && \ + echo ' Source Files' >>$(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 ' ' >>$(1).vs12.sourcefiles && \ + echo ' Source Files' >>$(1).vs12.sourcefiles.filters \ + ;; \ + esac; \ + done + + $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxprojin >$(top_builddir)/win32/vs12/$(1).vcxproj + $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs12/$(1).vcxproj.filters + $(RM) $(1).vs12.sourcefiles + $(RM) $(1).vs12.sourcefiles.filters + +$(top_builddir)/win32/vs12/$(1).vs12.headers: Makefile + -$(RM) $(top_builddir)/win32/vs12/$(1).vs12.headers + + for F in $(_proj_headers); do \ + case $$$$F in \ + $(_proj_headers_excludes)) \ + ;; \ + *.h|*.hpp|*.hh|*.hxx) \ + echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs12/$(1).vs12.headers \ + ;; \ + esac; \ + done + +endef + +$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff --git a/build/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak similarity index 100% rename from build/win32/detectenv-msvc.mak rename to win32/detectenv-msvc.mak diff --git a/build/win32/glibpc.py b/win32/glibpc.py similarity index 100% rename from build/win32/glibpc.py rename to win32/glibpc.py diff --git a/build/win32/pc_base.py b/win32/pc_base.py similarity index 99% rename from build/win32/pc_base.py rename to win32/pc_base.py index 587ba83d1..285b6cdd8 100644 --- a/build/win32/pc_base.py +++ b/win32/pc_base.py @@ -23,7 +23,7 @@ class BasePCItems: self.libdir = '' self.prefix = '' self.srcdir = os.path.dirname(__file__) - self.top_srcdir = self.srcdir + '\\..\\..' + self.top_srcdir = self.srcdir + '\\..' self.version = '' def setup(self, argv, parser=None): diff --git a/build/win32/replace.py b/win32/replace.py similarity index 100% rename from build/win32/replace.py rename to win32/replace.py diff --git a/build/win32/setup.py b/win32/setup.py similarity index 70% rename from build/win32/setup.py rename to win32/setup.py index 749b880f9..f3cac2ea3 100644 --- a/build/win32/setup.py +++ b/win32/setup.py @@ -42,7 +42,7 @@ def get_srcroot(): else: path = __file__ dirname = os.path.dirname(path) - return os.path.abspath(os.path.join(dirname, '..', '..')) + return os.path.abspath(os.path.join(dirname, '..')) def process_include(src, dest, includes): RE_INCLUDE = re.compile(r'^\s*#include\s+"(.*)"') @@ -82,15 +82,15 @@ def generate_libgio_sourcefiles(srcroot, dest, stype): if stype == '9': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t\n') + d.write('\t\t\t\n') elif stype == '10': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t\n') + d.write('\t\t\t\n') elif stype == '10f': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\tSource Files\n') + d.write('\t\t\tSource Files\n') else: raise Exception("Must specify project type (9, 10 or 10f)") @@ -122,15 +122,15 @@ def generate_libglib_sourcefiles(srcroot, dest, stype): if stype == '9': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t\n') + d.write('\t\t\t\n') elif stype == '10': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t\n') + d.write('\t\t\t\n') elif stype == '10f': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\tSource Files\n') + d.write('\t\t\tSource Files\n') else: raise Exception("Must specify project type (9, 10 or 10f)") @@ -146,15 +146,15 @@ def generate_libgobject_sourcefiles(srcroot, dest, stype): if stype == '9': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t\n') + d.write('\t\t\t\n') elif stype == '10': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t\n') + d.write('\t\t\t\n') elif stype == '10f': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\tSource Files\n') + d.write('\t\t\tSource Files\n') else: raise Exception("Must specify project type (9, 10 or 10f)") @@ -263,23 +263,23 @@ def main(argv): #------------ submodule gobject ------------------- generate_libglib_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libglib.sourcefiles'), '9') + os.path.join(srcroot, 'win32', 'libglib.sourcefiles'), '9') generate_libglib_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles'), '10') + os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles'), '10') generate_libglib_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles.filters'), '10f') - process_include(os.path.join(srcroot, 'build', 'win32', 'vs9', 'glib.vcprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs9', 'glib.vcproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxproj.filtersin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxproj.filters'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libglib.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles.filters')) + os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles.filters'), '10f') + process_include(os.path.join(srcroot, 'win32', 'vs9', 'glib.vcprojin'), + os.path.join(srcroot, 'win32', 'vs9', 'glib.vcproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxprojin'), + os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj.filtersin'), + os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj.filters'), + includes = [os.path.join(srcroot, 'win32')]) + os.unlink(os.path.join(srcroot, 'win32', 'libglib.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles.filters')) with open(os.path.join(srcroot, 'glib', 'gspawn-win32-helper-console.c'), 'w') as c: c.write('#define HELPER_CONSOLE\n') c.write('#include "gspawn-win32-helper.c"\n') @@ -318,45 +318,45 @@ def main(argv): os.chdir(cwd) generate_libgobject_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgobject.sourcefiles'), '9') + os.path.join(srcroot, 'win32', 'libgobject.sourcefiles'), '9') generate_libgobject_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgobject.vs10.sourcefiles'), '10') + os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles'), '10') generate_libgobject_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgobject.vs10.sourcefiles.filters'), '10f') - process_include(os.path.join(srcroot, 'build', 'win32', 'vs9', 'gobject.vcprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs9', 'gobject.vcproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxproj.filtersin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxproj.filters'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgobject.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgobject.vs10.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgobject.vs10.sourcefiles.filters')) + os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles.filters'), '10f') + process_include(os.path.join(srcroot, 'win32', 'vs9', 'gobject.vcprojin'), + os.path.join(srcroot, 'win32', 'vs9', 'gobject.vcproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxprojin'), + os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj.filtersin'), + os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj.filters'), + includes = [os.path.join(srcroot, 'win32')]) + os.unlink(os.path.join(srcroot, 'win32', 'libgobject.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles.filters')) #------------ end of submodule gobject ------------------- #------------ submodule gio ------------------- #depends on glib-mkenums generate_libgio_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgio.sourcefiles'), '9') + os.path.join(srcroot, 'win32', 'libgio.sourcefiles'), '9') generate_libgio_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles'), '10') + os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles'), '10') generate_libgio_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles.filters'), '10f') - process_include(os.path.join(srcroot, 'build', 'win32', 'vs9', 'gio.vcprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs9', 'gio.vcproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxproj.filtersin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxproj.filters'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgio.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles.filters')) + os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles.filters'), '10f') + process_include(os.path.join(srcroot, 'win32', 'vs9', 'gio.vcprojin'), + os.path.join(srcroot, 'win32', 'vs9', 'gio.vcproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxprojin'), + os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj.filtersin'), + os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj.filters'), + includes = [os.path.join(srcroot, 'win32')]) + os.unlink(os.path.join(srcroot, 'win32', 'libgio.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles.filters')) generate_libgio_enumtypes(srcroot, opt.perl) #------------ end of submodule gio ------------------- diff --git a/build/win32/vs10/.gitignore b/win32/vs10/.gitignore similarity index 100% rename from build/win32/vs10/.gitignore rename to win32/vs10/.gitignore diff --git a/build/win32/vs10/Makefile.am b/win32/vs10/Makefile.am similarity index 82% rename from build/win32/vs10/Makefile.am rename to win32/vs10/Makefile.am index 078ee7da8..08912db30 100644 --- a/build/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -57,11 +57,11 @@ EXTRA_DIST = \ glib-gen-srcs.props \ $(GENERATED_ITEMS) -glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST) - -$(RM) $(top_builddir)/build/win32/vs11/glib-install.props - -$(RM) $(top_builddir)/build/win32/vs12/glib-install.props - -$(RM) $(top_builddir)/build/win32/vs14/glib-install.props - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib-install.propsin >$@ +glib-install.props: $(top_srcdir)/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST) + -$(RM) $(top_builddir)/win32/vs11/glib-install.props + -$(RM) $(top_builddir)/win32/vs12/glib-install.props + -$(RM) $(top_builddir)/win32/vs14/glib-install.props + $(CPP) -P - <$(top_srcdir)/win32/vs10/glib-install.propsin >$@ rm $(MSVC10_HEADERS_LIST) DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/vs10/README.txt b/win32/vs10/README.txt similarity index 100% rename from build/win32/vs10/README.txt rename to win32/vs10/README.txt diff --git a/build/win32/vs10/gdbus.vcxproj b/win32/vs10/gdbus.vcxproj similarity index 94% rename from build/win32/vs10/gdbus.vcxproj rename to win32/vs10/gdbus.vcxproj index 759143f2b..2c2cdf697 100644 --- a/build/win32/vs10/gdbus.vcxproj +++ b/win32/vs10/gdbus.vcxproj @@ -75,7 +75,7 @@ Disabled - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -94,7 +94,7 @@ Disabled - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +118,7 @@ MaxSpeed true - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL true @@ -137,7 +137,7 @@ - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL @@ -158,7 +158,7 @@ - + @@ -177,4 +177,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/gdbus.vcxproj.filters b/win32/vs10/gdbus.vcxproj.filters similarity index 87% rename from build/win32/vs10/gdbus.vcxproj.filters rename to win32/vs10/gdbus.vcxproj.filters index ce37c1cce..1921c4967 100644 --- a/build/win32/vs10/gdbus.vcxproj.filters +++ b/win32/vs10/gdbus.vcxproj.filters @@ -7,8 +7,8 @@ - + Source Files - \ No newline at end of file + diff --git a/build/win32/vs10/gio-querymodules.vcxproj b/win32/vs10/gio-querymodules.vcxproj similarity index 94% rename from build/win32/vs10/gio-querymodules.vcxproj rename to win32/vs10/gio-querymodules.vcxproj index b33a1d186..41a6edd4b 100644 --- a/build/win32/vs10/gio-querymodules.vcxproj +++ b/win32/vs10/gio-querymodules.vcxproj @@ -75,7 +75,7 @@ Disabled - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) true EnableFastChecks @@ -94,7 +94,7 @@ Disabled - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +118,7 @@ MaxSpeed true - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) $(GioInBuildMacro);%(PreprocessorDefinitions) MultiThreadedDLL true @@ -137,7 +137,7 @@ - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) $(GioInBuildMacro);%(PreprocessorDefinitions) MultiThreadedDLL @@ -158,7 +158,7 @@ - + @@ -181,4 +181,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/gio-querymodules.vcxproj.filters b/win32/vs10/gio-querymodules.vcxproj.filters similarity index 86% rename from build/win32/vs10/gio-querymodules.vcxproj.filters rename to win32/vs10/gio-querymodules.vcxproj.filters index 79fbfa1fb..c39abf59a 100644 --- a/build/win32/vs10/gio-querymodules.vcxproj.filters +++ b/win32/vs10/gio-querymodules.vcxproj.filters @@ -7,8 +7,8 @@ - + Source Files - \ No newline at end of file + diff --git a/build/win32/vs10/gio-tool.vcxproj.filtersin b/win32/vs10/gio-tool.vcxproj.filtersin similarity index 100% rename from build/win32/vs10/gio-tool.vcxproj.filtersin rename to win32/vs10/gio-tool.vcxproj.filtersin diff --git a/build/win32/vs10/gio-tool.vcxprojin b/win32/vs10/gio-tool.vcxprojin similarity index 94% rename from build/win32/vs10/gio-tool.vcxprojin rename to win32/vs10/gio-tool.vcxprojin index 4d7cf3921..60d662aa4 100644 --- a/build/win32/vs10/gio-tool.vcxprojin +++ b/win32/vs10/gio-tool.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) true EnableFastChecks @@ -96,7 +96,7 @@ Disabled - ..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) true EnableFastChecks @@ -122,7 +122,7 @@ MaxSpeed true - ..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) $(GioInBuildMacro);%(PreprocessorDefinitions) MultiThreadedDLL true @@ -143,7 +143,7 @@ - ..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) $(GioInBuildMacro);%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gio.vcxproj.filtersin b/win32/vs10/gio.vcxproj.filtersin similarity index 86% rename from build/win32/vs10/gio.vcxproj.filtersin rename to win32/vs10/gio.vcxproj.filtersin index 6c1abecd2..72a62016f 100644 --- a/build/win32/vs10/gio.vcxproj.filtersin +++ b/win32/vs10/gio.vcxproj.filtersin @@ -18,10 +18,10 @@ #include "gio.vs10.sourcefiles.filters" - Resource Files + Resource Files - + Resource Files diff --git a/build/win32/vs10/gio.vcxprojin b/win32/vs10/gio.vcxprojin similarity index 83% rename from build/win32/vs10/gio.vcxprojin rename to win32/vs10/gio.vcxprojin index fecd2ca9f..2e61dee7a 100644 --- a/build/win32/vs10/gio.vcxprojin +++ b/win32/vs10/gio.vcxprojin @@ -74,7 +74,7 @@ Disabled - ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) + ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;$(GioBuildDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -100,7 +100,7 @@ - ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) + ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) $(GioBuildDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -127,7 +127,7 @@ Disabled - ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) + ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;$(GioBuildDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -153,7 +153,7 @@ - ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) + ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) $(GioBuildDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -181,23 +181,17 @@ #include "gio.vs10.sourcefiles" - - Copying gnetworking.h from gnetworking.h.win32... - $(GenGNetworkingH) - ..\..\..\gio\gnetworking.h;%(Outputs) - Copying gnetworking.h from gnetworking.h.win32... - $(GenGNetworkingH) - ..\..\..\gio\gnetworking.h;%(Outputs) - Copying gnetworking.h from gnetworking.h.win32... - $(GenGNetworkingH) - ..\..\..\gio\gnetworking.h;%(Outputs) - Copying gnetworking.h from gnetworking.h.win32... - $(GenGNetworkingH) - ..\..\..\gio\gnetworking.h;%(Outputs) + + Copying gnetworking.h from gnetworking.h.win32... + $(GenGNetworkingH) + ..\..\gio\gnetworking.h;%(Outputs) + Copying gnetworking.h from gnetworking.h.win32... + $(GenGNetworkingH) + ..\..\gio\gnetworking.h;%(Outputs) - + diff --git a/build/win32/vs10/glib-build-defines.props b/win32/vs10/glib-build-defines.props similarity index 96% rename from build/win32/vs10/glib-build-defines.props rename to win32/vs10/glib-build-defines.props index 9634e5b33..6de6fec36 100644 --- a/build/win32/vs10/glib-build-defines.props +++ b/win32/vs10/glib-build-defines.props @@ -26,7 +26,7 @@ - ..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) + ..\..;..\..\glib;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) HAVE_CONFIG_H;%(PreprocessorDefinitions) msvc_recommended_pragmas.h;%(ForcedIncludeFiles) true diff --git a/build/win32/vs10/glib-compile-resources.vcxproj.filtersin b/win32/vs10/glib-compile-resources.vcxproj.filtersin similarity index 100% rename from build/win32/vs10/glib-compile-resources.vcxproj.filtersin rename to win32/vs10/glib-compile-resources.vcxproj.filtersin diff --git a/build/win32/vs10/glib-compile-resources.vcxprojin b/win32/vs10/glib-compile-resources.vcxprojin similarity index 94% rename from build/win32/vs10/glib-compile-resources.vcxprojin rename to win32/vs10/glib-compile-resources.vcxprojin index e098347b6..f28e59d30 100644 --- a/build/win32/vs10/glib-compile-resources.vcxprojin +++ b/win32/vs10/glib-compile-resources.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories) + ..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories) _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) true EnableFastChecks @@ -94,7 +94,7 @@ Disabled - ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories) + ..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories) _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +118,7 @@ MaxSpeed true - ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories) + ..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories) $(GioInBuildMacro);%(PreprocessorDefinitions) MultiThreadedDLL true @@ -137,7 +137,7 @@ - ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories) + ..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories) $(GioInBuildMacro);%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/glib-compile-schemas.vcxproj.filtersin b/win32/vs10/glib-compile-schemas.vcxproj.filtersin similarity index 100% rename from build/win32/vs10/glib-compile-schemas.vcxproj.filtersin rename to win32/vs10/glib-compile-schemas.vcxproj.filtersin diff --git a/build/win32/vs10/glib-compile-schemas.vcxprojin b/win32/vs10/glib-compile-schemas.vcxprojin similarity index 94% rename from build/win32/vs10/glib-compile-schemas.vcxprojin rename to win32/vs10/glib-compile-schemas.vcxprojin index fff97fb42..ba4199aea 100644 --- a/build/win32/vs10/glib-compile-schemas.vcxprojin +++ b/win32/vs10/glib-compile-schemas.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -94,7 +94,7 @@ Disabled - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +118,7 @@ MaxSpeed true - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL true @@ -137,7 +137,7 @@ - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/glib-gen-srcs.props b/win32/vs10/glib-gen-srcs.props similarity index 67% rename from build/win32/vs10/glib-gen-srcs.props rename to win32/vs10/glib-gen-srcs.props index 64a20eae9..a9fc09ad5 100644 --- a/build/win32/vs10/glib-gen-srcs.props +++ b/win32/vs10/glib-gen-srcs.props @@ -4,11 +4,11 @@ - copy ..\..\..\config.h.win32 ..\..\..\config.h - copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h - copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h - copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h - if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion) + copy ..\..\config.h.win32 ..\..\config.h + copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h + copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h + copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h + if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion) <_PropertySheetDisplayName>glibgensrcsprops diff --git a/build/win32/vs10/glib-genmarshal.vcxproj b/win32/vs10/glib-genmarshal.vcxproj similarity index 99% rename from build/win32/vs10/glib-genmarshal.vcxproj rename to win32/vs10/glib-genmarshal.vcxproj index 8f31f7b26..2ce4b2884 100644 --- a/build/win32/vs10/glib-genmarshal.vcxproj +++ b/win32/vs10/glib-genmarshal.vcxproj @@ -159,7 +159,7 @@ - + @@ -170,4 +170,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/glib-genmarshal.vcxproj.filters b/win32/vs10/glib-genmarshal.vcxproj.filters similarity index 92% rename from build/win32/vs10/glib-genmarshal.vcxproj.filters rename to win32/vs10/glib-genmarshal.vcxproj.filters index 12b29afff..bcb3d4a49 100644 --- a/build/win32/vs10/glib-genmarshal.vcxproj.filters +++ b/win32/vs10/glib-genmarshal.vcxproj.filters @@ -15,8 +15,8 @@ - + Source Files - \ No newline at end of file + diff --git a/build/win32/vs10/glib-install.propsin b/win32/vs10/glib-install.propsin similarity index 81% rename from build/win32/vs10/glib-install.propsin rename to win32/vs10/glib-install.propsin index e6b13a668..eeb2965f1 100644 --- a/build/win32/vs10/glib-install.propsin +++ b/win32/vs10/glib-install.propsin @@ -36,31 +36,31 @@ copy $(BinDir)\gdbus.exe $(CopyDir)\bin copy $(BinDir)\gdbus.pdb $(CopyDir)\bin copy $(BinDir)\gio.exe $(CopyDir)\bin copy $(BinDir)\gio.pdb $(CopyDir)\bin -copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen +copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen -if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin +if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated -copy ..\..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) -copy ..\..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion) -copy ..\..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion) #include "glib.vs10.headers" -copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion) mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject #include "gobject.vs10.headers" -copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject +copy ..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio #include "gio.vs10.headers" mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio -copy ..\..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio -copy ..\..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio +copy ..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio +copy ..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include -copy ..\..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include +copy ..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include copy $(BinDir)\glib-$(ApiVersion).lib $(CopyDir)\lib copy $(BinDir)\gthread-$(ApiVersion).lib $(CopyDir)\lib copy $(BinDir)\gmodule-$(ApiVersion).lib $(CopyDir)\lib @@ -78,10 +78,10 @@ copy ..\gthread-2.0.pc $(CopyDir)\lib\pkgconfig copy ..\glib-2.0.pc $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas -copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas +copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen -copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen +copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen ..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc (if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion)) diff --git a/build/win32/vs10/glib-install.vcxproj b/win32/vs10/glib-install.vcxproj similarity index 66% rename from build/win32/vs10/glib-install.vcxproj rename to win32/vs10/glib-install.vcxproj index faa440490..cb13a848a 100644 --- a/build/win32/vs10/glib-install.vcxproj +++ b/win32/vs10/glib-install.vcxproj @@ -67,14 +67,10 @@ - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + @@ -86,36 +82,22 @@ - Generating .pc files... - $(GlibGenPC) - $(GlibPCFiles);%(Outputs) - Generating .pc files... - $(GlibGenPC) - $(GlibPCFiles);%(Outputs) - Generating .pc files... - $(GlibGenPC) - $(GlibPCFiles);%(Outputs) - Generating .pc files... - $(GlibGenPC) - $(GlibPCFiles);%(Outputs) + Generating .pc files... + $(GlibGenPC) + $(GlibPCFiles);%(Outputs) + Generating .pc files... + $(GlibGenPC) + $(GlibPCFiles);%(Outputs) - - Installing Build Results... - $(GlibPCFiles) - $(GlibDoInstall) - blah;%(Outputs) - Installing Build Results... - $(GlibPCFiles) - $(GlibDoInstall) - blah;%(Outputs) - Installing Build Results... - $(GlibPCFiles) - $(GlibDoInstall) - blah;%(Outputs) - Installing Build Results... - $(GlibPCFiles) - $(GlibDoInstall) - blah;%(Outputs) + + Installing Build Results... + $(GlibPCFiles) + $(GlibDoInstall) + blah;%(Outputs) + Installing Build Results... + $(GlibPCFiles) + $(GlibDoInstall) + blah;%(Outputs) @@ -183,4 +165,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/glib-install.vcxproj.filters b/win32/vs10/glib-install.vcxproj.filters similarity index 84% rename from build/win32/vs10/glib-install.vcxproj.filters rename to win32/vs10/glib-install.vcxproj.filters index 18ffe5f13..2c5e00c4a 100644 --- a/build/win32/vs10/glib-install.vcxproj.filters +++ b/win32/vs10/glib-install.vcxproj.filters @@ -7,7 +7,7 @@ - Resource Files + Resource Files Resource Files diff --git a/build/win32/vs10/glib-version-paths.props.in b/win32/vs10/glib-version-paths.props.in similarity index 96% rename from build/win32/vs10/glib-version-paths.props.in rename to win32/vs10/glib-version-paths.props.in index 693225262..468e558f5 100644 --- a/build/win32/vs10/glib-version-paths.props.in +++ b/win32/vs10/glib-version-paths.props.in @@ -4,7 +4,7 @@ 10 @GLIB_VERSION@ 2.0 - ..\..\..\..\vs$(VSVer)\$(Platform) + ..\..\..\vs$(VSVer)\$(Platform) $(GlibEtcInstallRoot) lib -$(ApiVersion)-0 @@ -55,4 +55,4 @@ $(PythonPath) - \ No newline at end of file + diff --git a/build/win32/vs10/glib.sln b/win32/vs10/glib.sln similarity index 100% rename from build/win32/vs10/glib.sln rename to win32/vs10/glib.sln diff --git a/win32/vs10/glib.vcxproj.filtersin b/win32/vs10/glib.vcxproj.filtersin new file mode 100644 index 000000000..7a5084c8e --- /dev/null +++ b/win32/vs10/glib.vcxproj.filtersin @@ -0,0 +1,66 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {bb961775-fd45-4205-b1fd-901c3c8fd64c} + + + {f630c518-4c58-4dfa-ab43-5fa0b0eb10f1} + + + {9fef0e23-cf71-48aa-979b-7eb84df56143} + + + {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 "glib.vs10.sourcefiles.filters" + Source Files + Source Files + Source Files + Source Files + Source Files\libcharset + Source Files\gnulib + Source Files\gnulib + Source Files\gnulib + Source Files\gnulib + Source Files\gnulib + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + Source Files\pcre + + + Resource Files + Resource Files + + + + Resource Files + + + diff --git a/win32/vs10/glib.vcxprojin b/win32/vs10/glib.vcxprojin new file mode 100644 index 000000000..3ee8f2b14 --- /dev/null +++ b/win32/vs10/glib.vcxprojin @@ -0,0 +1,533 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Debug_BundledPCRE + Win32 + + + Debug_BundledPCRE + x64 + + + Release + Win32 + + + Release + x64 + + + Release_BundledPCRE + Win32 + + + Release_BundledPCRE + x64 + + + + {12BCA020-EABF-429E-876A-A476BC9C10C0} + glib + Win32Proj + + + + DynamicLibrary + MultiByte + true + v100 + + + DynamicLibrary + MultiByte + true + v100 + + + DynamicLibrary + MultiByte + v100 + + + DynamicLibrary + MultiByte + v100 + + + DynamicLibrary + MultiByte + true + v100 + + + DynamicLibrary + MultiByte + true + v100 + + + DynamicLibrary + MultiByte + v100 + + + DynamicLibrary + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + Debug\$(Platform)\bin\ + true + false + Release\$(Platform)\bin\ + false + + + + Disabled + _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + CompileAsC + + + ws2_32.lib;winmm.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + true + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + Windows + false + + + MachineX86 + + + + + Disabled + _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + CompileAsC + + + ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + true + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + Windows + false + + + MachineX86 + + + + + Disabled + _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + ws2_32.lib;winmm.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + true + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + Windows + false + + + MachineX64 + + + + + Disabled + _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + true + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + Windows + false + + + MachineX64 + + + + + $(GLibBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + ws2_32.lib;winmm.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + true + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + Windows + true + true + false + + + MachineX86 + + + + + $(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + true + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + Windows + true + true + false + + + MachineX86 + + + + + $(GLibBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + ws2_32.lib;winmm.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + true + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + Windows + true + true + false + + + MachineX64 + + + + + $(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + true + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + Windows + true + true + false + + + MachineX64 + + + +#include "glib.vs10.sourcefiles" + + + + + + $(LocalCharsetDefs);%(PreprocessorDefinitions) + $(LocalCharsetDefs);%(PreprocessorDefinitions) + $(LocalCharsetDefs);%(PreprocessorDefinitions) + $(LocalCharsetDefs);%(PreprocessorDefinitions) + + + + + + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + $(GLibBundledPCREDefines);%(PreprocessorDefinitions) + $(GLibBundledPCREUndefs) %(AdditionalOptions) + true + + + + + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\config.h;%(Outputs) + + + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\glib\glibconfig.h;%(Outputs) + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\glib\glibconfig.h;%(Outputs) + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\glib\glibconfig.h;%(Outputs) + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\glib\glibconfig.h;%(Outputs) + + + + + + + + + diff --git a/build/win32/vs10/gmodule.vcxproj b/win32/vs10/gmodule.vcxproj similarity index 81% rename from build/win32/vs10/gmodule.vcxproj rename to win32/vs10/gmodule.vcxproj index d4f5070ec..7ed6e1c1d 100644 --- a/build/win32/vs10/gmodule.vcxproj +++ b/win32/vs10/gmodule.vcxproj @@ -67,10 +67,8 @@ - true - false - true - false + true + false @@ -171,26 +169,20 @@ - + - - Copying gmoduleconf.h from gmoduleconf.h.win32... - $(GenGModuleConfH) - ..\..\..\gmodule\gmoduleconf.h;%(Outputs) - Copying gmoduleconf.h from gmoduleconf.h.win32... - $(GenGModuleConfH) - ..\..\..\gmodule\gmoduleconf.h;%(Outputs) - Copying gmoduleconf.h from gmoduleconf.h.win32... - $(GenGModuleConfH) - ..\..\..\gmodule\gmoduleconf.h;%(Outputs) - Copying gmoduleconf.h from gmoduleconf.h.win32... - $(GenGModuleConfH) - ..\..\..\gmodule\gmoduleconf.h;%(Outputs) + + Copying gmoduleconf.h from gmoduleconf.h.win32... + $(GenGModuleConfH) + ..\..\gmodule\gmoduleconf.h;%(Outputs) + Copying gmoduleconf.h from gmoduleconf.h.win32... + $(GenGModuleConfH) + ..\..\gmodule\gmoduleconf.h;%(Outputs) - + @@ -201,4 +193,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/gmodule.vcxproj.filters b/win32/vs10/gmodule.vcxproj.filters similarity index 80% rename from build/win32/vs10/gmodule.vcxproj.filters rename to win32/vs10/gmodule.vcxproj.filters index 968e8ac1d..df97a6b67 100644 --- a/build/win32/vs10/gmodule.vcxproj.filters +++ b/win32/vs10/gmodule.vcxproj.filters @@ -15,16 +15,16 @@ - + Source Files - Resource Files + Resource Files - + Resource Files - \ No newline at end of file + diff --git a/build/win32/vs10/gobject.vcxproj.filtersin b/win32/vs10/gobject.vcxproj.filtersin similarity index 85% rename from build/win32/vs10/gobject.vcxproj.filtersin rename to win32/vs10/gobject.vcxproj.filtersin index 31748029e..b9f83075e 100644 --- a/build/win32/vs10/gobject.vcxproj.filtersin +++ b/win32/vs10/gobject.vcxproj.filtersin @@ -18,10 +18,10 @@ #include "gobject.vs10.sourcefiles.filters" - Resource Files + Resource Files - + Resource Files diff --git a/build/win32/vs10/gobject.vcxprojin b/win32/vs10/gobject.vcxprojin similarity index 83% rename from build/win32/vs10/gobject.vcxprojin rename to win32/vs10/gobject.vcxprojin index b08bd5b99..c61ef8fd9 100644 --- a/build/win32/vs10/gobject.vcxprojin +++ b/win32/vs10/gobject.vcxprojin @@ -67,10 +67,8 @@ - true - false - true - false + true + false @@ -174,23 +172,17 @@ #include "gobject.vs10.sourcefiles" - - Generating glib-mkenums... - $(GenGLibMKEnums) - ..\..\..\gobject\glib-mkenums;%(Outputs) - Generating glib-mkenums... - $(GenGLibMKEnums) - ..\..\..\gobject\glib-mkenums;%(Outputs) - Generating glib-mkenums... - $(GenGLibMKEnums) - ..\..\..\gobject\glib-mkenums;%(Outputs) - Generating glib-mkenums... - $(GenGLibMKEnums) - ..\..\..\gobject\glib-mkenums;%(Outputs) + + Generating glib-mkenums... + $(GenGLibMKEnums) + ..\..\gobject\glib-mkenums;%(Outputs) + Generating glib-mkenums... + $(GenGLibMKEnums) + ..\..\gobject\glib-mkenums;%(Outputs) - + diff --git a/build/win32/vs10/gresource.vcxproj b/win32/vs10/gresource.vcxproj similarity index 94% rename from build/win32/vs10/gresource.vcxproj rename to win32/vs10/gresource.vcxproj index f52b38acc..fb0faa2ad 100644 --- a/build/win32/vs10/gresource.vcxproj +++ b/win32/vs10/gresource.vcxproj @@ -75,7 +75,7 @@ Disabled - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -94,7 +94,7 @@ Disabled - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +118,7 @@ MaxSpeed true - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL true @@ -137,7 +137,7 @@ - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL @@ -158,7 +158,7 @@ - + @@ -177,4 +177,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/gresource.vcxproj.filters b/win32/vs10/gresource.vcxproj.filters similarity index 87% rename from build/win32/vs10/gresource.vcxproj.filters rename to win32/vs10/gresource.vcxproj.filters index 91dd6dc66..2e373bb9f 100644 --- a/build/win32/vs10/gresource.vcxproj.filters +++ b/win32/vs10/gresource.vcxproj.filters @@ -7,8 +7,8 @@ - + Source Files - \ No newline at end of file + diff --git a/build/win32/vs10/gsettings.vcxproj b/win32/vs10/gsettings.vcxproj similarity index 94% rename from build/win32/vs10/gsettings.vcxproj rename to win32/vs10/gsettings.vcxproj index f74913b80..4b3a76c96 100644 --- a/build/win32/vs10/gsettings.vcxproj +++ b/win32/vs10/gsettings.vcxproj @@ -75,7 +75,7 @@ Disabled - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -94,7 +94,7 @@ Disabled - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +118,7 @@ MaxSpeed true - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL true @@ -138,7 +138,7 @@ - ..\..\..\gmodule;%(AdditionalIncludeDirectories) + ..\..\gmodule;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL @@ -159,7 +159,7 @@ - + @@ -178,4 +178,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/gsettings.vcxproj.filters b/win32/vs10/gsettings.vcxproj.filters similarity index 87% rename from build/win32/vs10/gsettings.vcxproj.filters rename to win32/vs10/gsettings.vcxproj.filters index 0c81fc601..843c0cb2b 100644 --- a/build/win32/vs10/gsettings.vcxproj.filters +++ b/win32/vs10/gsettings.vcxproj.filters @@ -7,8 +7,8 @@ - + Source Files - \ No newline at end of file + diff --git a/build/win32/vs10/gspawn-win32-helper-console.vcxproj b/win32/vs10/gspawn-win32-helper-console.vcxproj similarity index 99% rename from build/win32/vs10/gspawn-win32-helper-console.vcxproj rename to win32/vs10/gspawn-win32-helper-console.vcxproj index 6cbb67cd9..7cf4a63ca 100644 --- a/build/win32/vs10/gspawn-win32-helper-console.vcxproj +++ b/win32/vs10/gspawn-win32-helper-console.vcxproj @@ -163,7 +163,7 @@ - + @@ -174,4 +174,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/gspawn-win32-helper-console.vcxproj.filters b/win32/vs10/gspawn-win32-helper-console.vcxproj.filters similarity index 91% rename from build/win32/vs10/gspawn-win32-helper-console.vcxproj.filters rename to win32/vs10/gspawn-win32-helper-console.vcxproj.filters index 5b9e6ef45..5b43689a1 100644 --- a/build/win32/vs10/gspawn-win32-helper-console.vcxproj.filters +++ b/win32/vs10/gspawn-win32-helper-console.vcxproj.filters @@ -15,8 +15,8 @@ - + Source Files - \ No newline at end of file + diff --git a/build/win32/vs10/gspawn-win32-helper.vcxproj b/win32/vs10/gspawn-win32-helper.vcxproj similarity index 99% rename from build/win32/vs10/gspawn-win32-helper.vcxproj rename to win32/vs10/gspawn-win32-helper.vcxproj index 581515e9b..7b4fd4445 100644 --- a/build/win32/vs10/gspawn-win32-helper.vcxproj +++ b/win32/vs10/gspawn-win32-helper.vcxproj @@ -163,7 +163,7 @@ - + @@ -174,4 +174,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/gspawn-win32-helper.vcxproj.filters b/win32/vs10/gspawn-win32-helper.vcxproj.filters similarity index 92% rename from build/win32/vs10/gspawn-win32-helper.vcxproj.filters rename to win32/vs10/gspawn-win32-helper.vcxproj.filters index 0a83fa2d9..85fd3f6f3 100644 --- a/build/win32/vs10/gspawn-win32-helper.vcxproj.filters +++ b/win32/vs10/gspawn-win32-helper.vcxproj.filters @@ -15,8 +15,8 @@ - + Source Files - \ No newline at end of file + diff --git a/build/win32/vs10/gthread.vcxproj b/win32/vs10/gthread.vcxproj similarity index 98% rename from build/win32/vs10/gthread.vcxproj rename to win32/vs10/gthread.vcxproj index 118bcfc65..19363774e 100644 --- a/build/win32/vs10/gthread.vcxproj +++ b/win32/vs10/gthread.vcxproj @@ -171,10 +171,10 @@ - + - + @@ -185,4 +185,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/gthread.vcxproj.filters b/win32/vs10/gthread.vcxproj.filters similarity index 77% rename from build/win32/vs10/gthread.vcxproj.filters rename to win32/vs10/gthread.vcxproj.filters index fb35c1ff3..82d30ab16 100644 --- a/build/win32/vs10/gthread.vcxproj.filters +++ b/win32/vs10/gthread.vcxproj.filters @@ -15,13 +15,9 @@ - - Source Files - + Source Files - - Resource Files - + Resource Files - \ No newline at end of file + diff --git a/build/win32/vs11/.gitignore b/win32/vs11/.gitignore similarity index 100% rename from build/win32/vs11/.gitignore rename to win32/vs11/.gitignore diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am similarity index 96% rename from build/win32/vs11/Makefile.am rename to win32/vs11/Makefile.am index 61de04ee0..5ea5b3202 100644 --- a/build/win32/vs11/Makefile.am +++ b/win32/vs11/Makefile.am @@ -46,4 +46,4 @@ MSVC_VER = 11 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 2012 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/build/win32/vs12/.gitignore b/win32/vs12/.gitignore similarity index 100% rename from build/win32/vs12/.gitignore rename to win32/vs12/.gitignore diff --git a/build/win32/vs12/Makefile.am b/win32/vs12/Makefile.am similarity index 96% rename from build/win32/vs12/Makefile.am rename to win32/vs12/Makefile.am index 94f8c71ab..370edbbf0 100644 --- a/build/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -46,4 +46,4 @@ MSVC_VER = 12 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 2013 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/build/win32/vs14/Makefile.am b/win32/vs14/Makefile.am similarity index 96% rename from build/win32/vs14/Makefile.am rename to win32/vs14/Makefile.am index 09051c57e..30eab9280 100644 --- a/build/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -46,4 +46,4 @@ MSVC_VER = 14 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 14 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/build/win32/vs9/.gitignore b/win32/vs9/.gitignore similarity index 100% rename from build/win32/vs9/.gitignore rename to win32/vs9/.gitignore diff --git a/build/win32/vs9/Makefile.am b/win32/vs9/Makefile.am similarity index 84% rename from build/win32/vs9/Makefile.am rename to win32/vs9/Makefile.am index bbc88197e..e40d3509a 100644 --- a/build/win32/vs9/Makefile.am +++ b/win32/vs9/Makefile.am @@ -35,8 +35,8 @@ EXTRA_DIST = \ glib-install.vspropsin \ $(GENERATED_ITEMS) -glib-install.vsprops: $(top_srcdir)/build/win32/vs9/glib-install.vspropsin $(MSVC_HEADERS_LIST) - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib-install.vspropsin >$@ +glib-install.vsprops: $(top_srcdir)/win32/vs9/glib-install.vspropsin $(MSVC_HEADERS_LIST) + $(CPP) -P - <$(top_srcdir)/win32/vs9/glib-install.vspropsin >$@ rm $(MSVC_HEADERS_LIST) DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/vs9/README.txt b/win32/vs9/README.txt similarity index 100% rename from build/win32/vs9/README.txt rename to win32/vs9/README.txt diff --git a/build/win32/vs9/gdbus.vcproj b/win32/vs9/gdbus.vcproj similarity index 92% rename from build/win32/vs9/gdbus.vcproj rename to win32/vs9/gdbus.vcproj index 5160e979f..6da34e358 100644 --- a/build/win32/vs9/gdbus.vcproj +++ b/win32/vs9/gdbus.vcproj @@ -31,7 +31,7 @@ - + diff --git a/build/win32/vs9/gio-querymodules.vcproj b/win32/vs9/gio-querymodules.vcproj similarity index 92% rename from build/win32/vs9/gio-querymodules.vcproj rename to win32/vs9/gio-querymodules.vcproj index 1aebb7ddb..4b00188b8 100644 --- a/build/win32/vs9/gio-querymodules.vcproj +++ b/win32/vs9/gio-querymodules.vcproj @@ -31,7 +31,7 @@ - + diff --git a/build/win32/vs9/gio-tool.vcprojin b/win32/vs9/gio-tool.vcprojin similarity index 94% rename from build/win32/vs9/gio-tool.vcprojin rename to win32/vs9/gio-tool.vcprojin index ffa91b292..267a44516 100644 --- a/build/win32/vs9/gio-tool.vcprojin +++ b/win32/vs9/gio-tool.vcprojin @@ -31,7 +31,7 @@ - + @@ -182,7 +182,7 @@ Name="VCCustomBuildTool" Description="Copying gnetworking.h from gnetworking.h.win32..." CommandLine="$(GenGNetworkingH)" - Outputs="..\..\..\gio\gnetworking.h" + Outputs="..\..\gio\gnetworking.h" /> @@ -190,7 +190,7 @@ Name="VCCustomBuildTool" Description="Copying gnetworking.h from gnetworking.h.win32..." CommandLine="$(GenGNetworkingH)" - Outputs="..\..\..\gio\gnetworking.h" + Outputs="..\..\gio\gnetworking.h" /> @@ -198,11 +198,11 @@ Name="VCCustomBuildTool" Description="Copying gnetworking.h from gnetworking.h.win32..." CommandLine="$(GenGNetworkingH)" - Outputs="..\..\..\gio\gnetworking.h" + Outputs="..\..\gio\gnetworking.h" /> - + diff --git a/build/win32/vs9/glib-build-defines.vsprops b/win32/vs9/glib-build-defines.vsprops similarity index 96% rename from build/win32/vs9/glib-build-defines.vsprops rename to win32/vs9/glib-build-defines.vsprops index cc36536a2..7e28cc5d0 100644 --- a/build/win32/vs9/glib-build-defines.vsprops +++ b/win32/vs9/glib-build-defines.vsprops @@ -9,7 +9,7 @@ > diff --git a/build/win32/vs9/glib-genmarshal.vcproj b/win32/vs9/glib-genmarshal.vcproj similarity index 98% rename from build/win32/vs9/glib-genmarshal.vcproj rename to win32/vs9/glib-genmarshal.vcproj index 6b0f481fc..b50be252b 100644 --- a/build/win32/vs9/glib-genmarshal.vcproj +++ b/win32/vs9/glib-genmarshal.vcproj @@ -141,7 +141,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > diff --git a/build/win32/vs9/glib-install.vcproj b/win32/vs9/glib-install.vcproj similarity index 100% rename from build/win32/vs9/glib-install.vcproj rename to win32/vs9/glib-install.vcproj diff --git a/build/win32/vs9/glib-install.vspropsin b/win32/vs9/glib-install.vspropsin similarity index 83% rename from build/win32/vs9/glib-install.vspropsin rename to win32/vs9/glib-install.vspropsin index a511ebbd9..dec524eca 100644 --- a/build/win32/vs9/glib-install.vspropsin +++ b/win32/vs9/glib-install.vspropsin @@ -38,29 +38,29 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.exe $(CopyDir) copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.pdb $(CopyDir)\bin copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.exe $(CopyDir)\bin copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.pdb $(CopyDir)\bin -copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen -if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin +copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen +if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated -copy ..\..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) -copy ..\..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion) -copy ..\..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion) -copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion) #include "glib.headers" mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject #include "gobject.headers" -copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject +copy ..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio #include "gio.headers" mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio -copy ..\..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio -copy ..\..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio +copy ..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio +copy ..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include -copy ..\..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include +copy ..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-$(ApiVersion).lib $(CopyDir)\lib copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gthread-$(ApiVersion).lib $(CopyDir)\lib @@ -79,10 +79,10 @@ copy ..\gthread-2.0.pc $(CopyDir)\lib\pkgconfig copy ..\glib-2.0.pc $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas -copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas +copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen -copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen +copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen " /> #include "glib.sourcefiles" - - - - + + + + - + @@ -302,16 +302,16 @@ - - - - - + + + + + - + @@ -321,7 +321,7 @@ - + @@ -331,7 +331,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -351,7 +351,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -371,7 +371,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -391,7 +391,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -431,7 +431,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -451,7 +451,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -471,7 +471,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -504,13 +504,13 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - + @@ -518,7 +518,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> @@ -526,7 +526,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> @@ -534,7 +534,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> @@ -542,7 +542,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> @@ -550,7 +550,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> @@ -558,7 +558,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> @@ -566,17 +566,17 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> - + @@ -584,7 +584,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> @@ -592,7 +592,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> @@ -600,7 +600,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> @@ -608,7 +608,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> @@ -616,7 +616,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> @@ -624,7 +624,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> @@ -632,11 +632,11 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> - + diff --git a/build/win32/vs9/gmodule.vcproj b/win32/vs9/gmodule.vcproj similarity index 93% rename from build/win32/vs9/gmodule.vcproj rename to win32/vs9/gmodule.vcproj index 03e991804..8df2f4c95 100644 --- a/build/win32/vs9/gmodule.vcproj +++ b/win32/vs9/gmodule.vcproj @@ -148,7 +148,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - + - + @@ -175,7 +175,7 @@ Name="VCCustomBuildTool" Description="Copying gmoduleconf.h from gmoduleconf.h.win32..." CommandLine="$(GenGModuleConfH)" - Outputs="..\..\..\gmodule\gmoduleconf.h" + Outputs="..\..\gmodule\gmoduleconf.h" /> @@ -183,7 +183,7 @@ Name="VCCustomBuildTool" Description="Copying gmoduleconf.h from gmoduleconf.h.win32..." CommandLine="$(GenGModuleConfH)" - Outputs="..\..\..\gmodule\gmoduleconf.h" + Outputs="..\..\gmodule\gmoduleconf.h" /> @@ -191,11 +191,11 @@ Name="VCCustomBuildTool" Description="Copying gmoduleconf.h from gmoduleconf.h.win32..." CommandLine="$(GenGModuleConfH)" - Outputs="..\..\..\gmodule\gmoduleconf.h" + Outputs="..\..\gmodule\gmoduleconf.h" /> - + diff --git a/build/win32/vs9/gobject.vcprojin b/win32/vs9/gobject.vcprojin similarity index 94% rename from build/win32/vs9/gobject.vcprojin rename to win32/vs9/gobject.vcprojin index 82609ccf0..bc6ce88df 100644 --- a/build/win32/vs9/gobject.vcprojin +++ b/win32/vs9/gobject.vcprojin @@ -161,13 +161,13 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - + @@ -175,7 +175,7 @@ Name="VCCustomBuildTool" Description="Generating glib-mkenums..." CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\..\gobject\glib-mkenums" + Outputs="..\..\gobject\glib-mkenums" /> @@ -183,7 +183,7 @@ Name="VCCustomBuildTool" Description="Generating glib-mkenums..." CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\..\gobject\glib-mkenums" + Outputs="..\..\gobject\glib-mkenums" /> @@ -191,11 +191,11 @@ Name="VCCustomBuildTool" Description="Generating glib-mkenums..." CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\..\gobject\glib-mkenums" + Outputs="..\..\gobject\glib-mkenums" /> - + diff --git a/build/win32/vs9/gresource.vcproj b/win32/vs9/gresource.vcproj similarity index 92% rename from build/win32/vs9/gresource.vcproj rename to win32/vs9/gresource.vcproj index 982f10d65..32b78fcd1 100644 --- a/build/win32/vs9/gresource.vcproj +++ b/win32/vs9/gresource.vcproj @@ -31,7 +31,7 @@ - + diff --git a/build/win32/vs9/gsettings.vcproj b/win32/vs9/gsettings.vcproj similarity index 92% rename from build/win32/vs9/gsettings.vcproj rename to win32/vs9/gsettings.vcproj index 48045811a..ea15c423e 100644 --- a/build/win32/vs9/gsettings.vcproj +++ b/win32/vs9/gsettings.vcproj @@ -31,7 +31,7 @@ - + diff --git a/build/win32/vs9/gspawn-win32-helper-console.vcproj b/win32/vs9/gspawn-win32-helper-console.vcproj similarity index 98% rename from build/win32/vs9/gspawn-win32-helper-console.vcproj rename to win32/vs9/gspawn-win32-helper-console.vcproj index 180252dbc..58fa6361d 100644 --- a/build/win32/vs9/gspawn-win32-helper-console.vcproj +++ b/win32/vs9/gspawn-win32-helper-console.vcproj @@ -143,7 +143,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > diff --git a/build/win32/vs9/gspawn-win32-helper.vcproj b/win32/vs9/gspawn-win32-helper.vcproj similarity index 98% rename from build/win32/vs9/gspawn-win32-helper.vcproj rename to win32/vs9/gspawn-win32-helper.vcproj index 5417f7db3..1918e3bc0 100644 --- a/build/win32/vs9/gspawn-win32-helper.vcproj +++ b/win32/vs9/gspawn-win32-helper.vcproj @@ -142,7 +142,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - + - + - +