From f3561115e44cceebc9aecb859ffdfca4ef36cf93 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 14 Jun 2017 11:12:22 +0800 Subject: Visual Studio builds: Use the Centricular fork of libffi The upstream libffi is getting bit-rotten on the regards of Windows/MSVC builds, and we are eventually moving towards to the Meson build system, so make use of the Centricular fork of libffi[1] which is better maintained and tested for Windows/MSVC builds. [1]: https://github.com/centricular/libffi --- win32/vs10/README.txt | 10 +++++----- win32/vs10/g-ir-compiler.vcxprojin | 16 ++++++++-------- win32/vs10/gi-build-defines.props | 6 +----- win32/vs10/girepository.vcxprojin | 8 ++++---- win32/vs9/README.txt | 9 ++++----- win32/vs9/g-ir-compiler.vcprojin | 16 ++++++++-------- win32/vs9/gi-build-defines.vsprops | 6 +----- win32/vs9/girepository.vcprojin | 8 ++++---- 8 files changed, 35 insertions(+), 44 deletions(-) diff --git a/win32/vs10/README.txt b/win32/vs10/README.txt index d3ff8b48..e91adbf6 100644 --- a/win32/vs10/README.txt +++ b/win32/vs10/README.txt @@ -19,11 +19,11 @@ usage of different CRTs. Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs10 on how to build GLib using Visual C++ 2010 -For LibFFI, please get version 3.0.10 or later, as Visual C++ build support -was added in the 3.0.10 release series. Please see the README file that -comes with the LibFFI source package for more details on how to build LibFFI -on Visual C++-please note that the mozilla-build package from Mozilla is needed -in order to build LibFFI on Windows. +For LibFFI, please use the Centricular fork of it, which can be found at +https://github.com/centricular/libffi. Please refer there on building--please +note that this will involve the use of the Meson build system and possible the +Ninja build tool, if the Visual Studio project generation is not used or is +unavailable. For Python, retrieving the official Windows binaries for 2.7 (2.x) or 3.3 (3.x) or later from http://www.python.org will do the job-be sure that the Python version that diff --git a/win32/vs10/g-ir-compiler.vcxprojin b/win32/vs10/g-ir-compiler.vcxprojin index f7a94f60..b73575d4 100644 --- a/win32/vs10/g-ir-compiler.vcxprojin +++ b/win32/vs10/g-ir-compiler.vcxprojin @@ -75,7 +75,7 @@ Disabled - _DEBUG;$(FFIDefines);%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -85,7 +85,7 @@ ProgramDatabase - libffi.lib;%(AdditionalDependencies) + ffi.lib;%(AdditionalDependencies) true Console MachineX86 @@ -97,7 +97,7 @@ Disabled - _DEBUG;$(FFIDefines);%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -107,7 +107,7 @@ ProgramDatabase - libffi.lib;%(AdditionalDependencies) + ffi.lib;%(AdditionalDependencies) true Console @@ -119,7 +119,7 @@ MaxSpeed true - $(FFIDefines);%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL true @@ -128,7 +128,7 @@ ProgramDatabase - libffi.lib;%(AdditionalDependencies) + ffi.lib;%(AdditionalDependencies) true Console true @@ -143,7 +143,7 @@ MaxSpeed true - $(FFIDefines);%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL true @@ -152,7 +152,7 @@ ProgramDatabase - libffi.lib;%(AdditionalDependencies) + ffi.lib;%(AdditionalDependencies) true Console true diff --git a/win32/vs10/gi-build-defines.props b/win32/vs10/gi-build-defines.props index 0b66dcf3..e3cef3dd 100644 --- a/win32/vs10/gi-build-defines.props +++ b/win32/vs10/gi-build-defines.props @@ -4,8 +4,7 @@ - FFI_BUILDING - G_IREPOSITORY_COMPILATION;$(FFIDefines);DLL_EXPORT + G_IREPOSITORY_COMPILATION;DLL_EXPORT cd .. set VCInstallDir=$(VCInstallDir) nmake -f gi-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot) @@ -30,9 +29,6 @@ nmake -f gi-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallR - - $(FFIDefines) - $(GIRepositoryBuildDefines) diff --git a/win32/vs10/girepository.vcxprojin b/win32/vs10/girepository.vcxprojin index 4339f779..2ff15572 100644 --- a/win32/vs10/girepository.vcxprojin +++ b/win32/vs10/girepository.vcxprojin @@ -86,7 +86,7 @@ ProgramDatabase - libffi.lib;%(AdditionalDependencies) + ffi.lib;%(AdditionalDependencies) $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll $(TargetDir)$(ProjectName)-$(ApiVersion).lib true @@ -109,7 +109,7 @@ ProgramDatabase - libffi.lib;%(AdditionalDependencies) + ffi.lib;%(AdditionalDependencies) $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll $(TargetDir)$(ProjectName)-$(ApiVersion).lib true @@ -137,7 +137,7 @@ ProgramDatabase - libffi.lib;%(AdditionalDependencies) + ffi.lib;%(AdditionalDependencies) $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll $(TargetDir)$(ProjectName)-$(ApiVersion).lib true @@ -163,7 +163,7 @@ ProgramDatabase - libffi.lib;%(AdditionalDependencies) + ffi.lib;%(AdditionalDependencies) $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll $(TargetDir)$(ProjectName)-$(ApiVersion).lib true diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt index 05cfc912..abd0b286 100644 --- a/win32/vs9/README.txt +++ b/win32/vs9/README.txt @@ -19,11 +19,10 @@ usage of different CRTs. Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs9 on how to build GLib using Visual C++ 2008 -For LibFFI, please get version 3.0.10 or later, as Visual C++ build support -was added in the 3.0.10 release series. Please see the README file that -comes with the LibFFI source package for more details on how to build LibFFI -on Visual C++-please note that the mozilla-build package from Mozilla is needed -in order to build LibFFI on Windows. +For LibFFI, please use the Centricular fork of it, which can be found at +https://github.com/centricular/libffi. Please refer there on building--please +note that this will involve the use of the Meson build system and the Ninja +build tool. For Python, retrieving the official Windows binaries for 2.7 (2.x) or 3.3 (3.x) or later from http://www.python.org will do the job-be sure that the Python version that diff --git a/win32/vs9/g-ir-compiler.vcprojin b/win32/vs9/g-ir-compiler.vcprojin index d0850084..e85847f1 100644 --- a/win32/vs9/g-ir-compiler.vcprojin +++ b/win32/vs9/g-ir-compiler.vcprojin @@ -28,7 +28,7 @@ -