Updated Windows cross compile scripts for QT5 and other goodies #430
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…, and to build release packages.
mikotoiii
changed the title
|
Merged! Thanks for the update! About the Qt4/Qt5 option: I suppose that we should remove Qt4 support soon, maybe after the release of a first alpha version.. So i hope that the Qt4/Qt5 duality is not present for a long time.. |
|
It will be easy enough to rip it out though like anything we'll need to spend a little time cleaning up afterwards since it checks a fair bit if it's building on qt4 or qt5. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added qt5 to mxe.sh
Added compilation for Windows using QT5
Added a new option (-o) called old build to compile for Windows using QT4 for backwards compatibility.
Added a new option (-r) to build releases for Windows. This will build both the 32bit and 64bit packages
Added a new option (-c) to clean the CMake files out of the windows directory, making it a fresh compile next time you run it.
Fixed up some path issues so now you can run the script from either the windows directory, or from the parent hydrogen directory. This could be used to chain load the cross compile from the main build script.
Note: I ran into some issues when making qt5 on my existing mxe installation. It hung up on the qt5system package (IIRC). I had to manually copy the new qt5system.mk file from the mxe github to the src dir in /opt/mxe and then I was able to proceed with my install (which took a little over an hour to complete). This issue should not be present on a fresh install of mxe.