Fix VS2017 build #980
Fix VS2017 build #980
Conversation
copying.md
Outdated
| @@ -108,6 +108,7 @@ _the openage authors_ are: | |||
| | Julian Guillotel | arialwhite | julian dawt gullotel à gmail dawt com | | |||
| | Arne Sellmann | PythonicChemist | arne dawt sellmann à gmx dawt de | | |||
| | Rafael X. Morales Georgi | chocoladisco | chocoladisco á gmail dawt com | | |||
| | Marcel Schneider | schnema123 | marcelschneider5 á outlook dawt de | | |||
There was a problem hiding this comment.
Replace á with à (similar to line 109 above).
You can optionally fix the last-but-one line also.
tusharpm
added
os: windows
| @@ -30,6 +31,8 @@ | |||
| If you want, you can still use [the prebuilt version](https://www.qt.io/download-open-source/) instead. | |||
| If you do so, include `-DCMAKE_PREFIX_PATH=<QT5 directory>` in the cmake configure command. | |||
|
|
|||
| _Note:_ If you are planing to build the 64-bit Version of openage, you are going to need 64-bit libraries. Add command line option `--triplet x64-windows` to the above command or add the enviroment variable `VCPKG_DEFAULT_TRIPLET=x64-windows` to build x64 libraries. [See here](https://github.com/Microsoft/vcpkg/issues/1254) | |||
There was a problem hiding this comment.
nit:
s/planing/planning/
s/Version/version/
s/enviroment/environment/
| ## Running openage (in devmode) | ||
| While this is straightforward on other platforms, there is still stuff to do to run openage on Windows: | ||
| - Install the [DejaVu Book Font](https://dejavu-fonts.github.io/Download.html). | ||
| - Download and extract the latest `dejavu-fonts-ttf` tarball/zip file. | ||
| - Copy `ttf/DejaVuSerif*.ttf` font files to `%WINDIR%/Fonts`. | ||
| - Set the `FONTCONFIG_PATH` environment variable to `<vcpkg directory>\installed\<relevant config>\tools\fontconfig\fonts\conf.d`. | ||
| - Set the `FONTCONFIG_PATH` environment variable to `<vcpkg directory>\installed\<relevant config>\tools\fontconfig\fonts\`. | ||
| - Copy `fontconfig/57-dejavu-serif.conf` to `%FONTCONFIG_PATH%`. |
There was a problem hiding this comment.
Nice catch. My bad. :P
Please update this line also: [...] %FONTCONFIG_PATH%/conf.d
libopenage/error/handlers.cpp
Outdated
| @@ -21,6 +21,7 @@ | |||
| #include <unistd.h> | |||
| #endif | |||
|
|
|||
| #include "../error/handlers.h" | |||
There was a problem hiding this comment.
The associated header file comes first.
Also, #include "handlers.h".
|
Ok guys, I had a running build (I have already broken it again.. but I was seeing something that looked like AoE2 on the screen like an hour ago, I swear!). I think I have documented every step that was needed to get there... Feel free to make suggestions. |
|
Tested it locally. Builds and runs properly for both 32bit and 64bit. Nice work! |
|
I have squashed and grouped the commits together. Greetings. |
|
Thank you, @schnema123! Great work! 👍 |
Hello, this fixes the build on the newest version of VS2017.
I have also documented a few of the problems I have encountered for others.
Also, I enabled multi-processor compilation on MSVC, that makes a significant difference in build times.
This is my first pull request on github, so be gentle. :P
Greetings.