summaryrefslogtreecommitdiff
path: root/win32
Commit message (Collapse)AuthorAgeFilesLines
* MSVC builds: Make marshal generation more robustChun-wei Fan2017-07-312-11/+11
| | | | | | | Since we may now have glib-genmarshal as a Python script or a standard .exe binary, make the process more robust by actually trying to run glib-genmarshal first as a Python script, and then falling back to the former .exe approach if the Python method failed.
* Visual Studio builds: Don't build introspection by defaultChun-wei Fan2017-07-1510-61/+43
| | | | | | | | | | | | | | | | We aren't able to do a sanity check for g-ir-scanner in the NMake Makefiles without extra tools, so it turns out that it would make it more clear to people if we do not build the introspection files by default here (especially that this is optional). So, by doing so people could get the items needed for introspection ready instead of build failures they do not expect, so people have to build the introspect project explicitly, which will copy the built introspection files to the appropriate location under $(GlibEtcInstallPrefix) when sucessfully done. Also fix the Visual Studio 2008 property sheets as a letter was accidentaly added, breaking the builds.
* win32/vsX: Fix 'make dist'Chun-wei Fan2017-07-146-6/+6
| | | | | | It should be atk-introspect.[vcproj|vcxproj], not atk-introspection.[vcproj|vcxproj]. Sorry!
* Visual Studio builds: Integrate introspection buildsChun-wei Fan2017-07-1319-1/+281
| | | | | | | | | | Since we hard-require Python for our builds, integrate introspection builds in the build process. This will fail if Python is not installed or correctly set at PythonDir/PythonDirX64 or g-ir-scanner is not found at $(GLibEtcInstallRoot)\bin, but it shouldn't otherwise impact the build in other ways as the built DLL and lib will still be built and copied normally. This is in place here before the Meson build system is ready for G-I and GLib.
* MSVC Builds: Use PythonDir instead of PythonPathChun-wei Fan2017-07-138-25/+29
| | | | | | | | | | | | | | If someone is building using MSBuild, we want to make sure that we do not use an envvar that would also determine where the Python modules are loaded. Also, allow different Python paths depending on the Visual Studio version that is being used for Visual Studio 201x builds, to better suit the version of Visual Studio that is used to build the official releases of Python, which means the default is as follows: -Visual Studio 2010, 2012, 2013: Python 3.4.x, which is built with 2010 -Visual Studio 2015 and 2017: Python 3.6.x, which is built with 2015.
* MSVC Builds: Adapt to new glib-genmarshal command lineChun-wei Fan2017-07-132-12/+12
| | | | | Use the --quiet and --output flags for the Python version of glib-genmarshal.
* Visual Studio builds: Adapt to the Python-fied glib-genmarshalChun-wei Fan2017-07-128-27/+62
| | | | | | | | | | | | | | | glib-genmarshal is used for the Visual Studio builds, and has been recently converted to a Python script instead of a compiled C program. Since Visual Studio calls cmd.exe to run Custom Build steps, we need to call Python explicitly to run glib-genmarshal as shebang lines are not supported in cmd.exe, which means that Python will become a hard build-time requirement instead of being optional. This also means that the atk.pc pkg-config file will always be generated. However, since ATK does not yet require a really recent GLib, maintain compatibility with older GLib by calling glib-genmarshal.exe when the glib-genmarshal Python script is not found.
* win32/replace.py: Fix replacing items in files with UTF-8 contentChun-wei Fan2017-05-091-2/+8
| | | | | | | | | Some files that this script will process might have UTF-8 items in there, which can cause problems on Python 3.x as it is more strict and careful on unicode issues. Fix this by: -Doing what we did before on Python 2.x -Opening the file with encoding='utf-8' on Python 3.x
* win32/Makefile.msvc.introspection: Sync with G-IChun-wei Fan2017-02-171-3/+7
| | | | | | This is so that we can support using a list of C includes and so generate the full NMake Makefile modules to build the .gir files in a simpler way.
* win32/detectenv-msvc.mak: Support Visual Studio 2017Chun-wei Fan2017-02-171-1/+3
| | | | | Sync the file from GLib so that we can build the introspection files using Visual Studio 2017.
* Remove win32/vs15/atk-install.props before re-generationChun-wei Fan2017-02-151-0/+1
| | | | | This will ensure that it will be up-to-date when win32/vs10/atk-install.props is re-generated.
* Visual Studio builds: Support Visual Studio 2017Chun-wei Fan2017-02-156-12/+42
| | | | | | | | | | | | | Update the autotools scripts so that we can copy the Visual Studio 2010 project files and update them to obtain the Visual Studio 2017 projects. As the format of the toolset version is different, allow a version number string for the toolset version and use it if specified, otherwise just create the toolset version string as we did before. Note that Visual Studio 2015 and 2017 aims to be compatible in terms of CRT usage, so it should be possible to use 2015-built binaries with 2017-built binaries.
* Visual Studio 201x builds: Fix previous commitChun-wei Fan2017-01-101-1/+1
| | | | | The previous commit which moved the project files from build/win32/ to win32/ also attempted to clean up things a bit. This fixes the cleanup.
* Visual Studio projects: Move to win32/Chun-wei Fan2017-01-1035-0/+2227
It was suggested that the project be moved to win32/, so that one will need to go one less layer down into the tree to reach the project files.