diff --git a/README.md b/README.md index 0f89c41..ad41825 100644 --- a/README.md +++ b/README.md @@ -66,14 +66,12 @@ Compiling qtbindings requires the following prerequisites: 1. Ruby (Ruby must be compiled with --enable-shared on all platforms and with --with-gcc=clang on OSX) On Windows use the latest from [RubyInstaller](http://rubyinstaller.org/downloads/) - You'll need both the 32bit and 64bit installers to make the fat binary gem 2. [CMake 3.6.x](https://cmake.org/download) 3. On Windows get [OpenSSL 1.0.2 x64](http://slproweb.com/products/Win32OpenSSL.html) (not Light) Install with all defaults to C:\OpenSSL-Win64 -4. [QT 4.8.6](https://download.qt.io/official_releases/qt/4.8/4.8.6/) (mingw version for Windows) - On Windows install to C:\Qt\4.8.6-Ruby24 (when installing specify the mingw inside the 32bit DevKit) - On Windows install a second copy to C:\Qt\4.8.6-64-Ruby24 (when installing specify the mingw inside the 64bit DevKit) - Install [Jom](https://wiki.qt.io/Jom) to C:\Qt\4.8.6-64-Ruby24 (or anywhere in your path) +4. [QT 4.8.6](https://download.qt.io/archive/qt/4.8/4.8.6/) (mingw version for Windows) + On Windows install to C:\Qt\4.8.6 (when installing specify C:\Ruby26-x64\msys64\mingw64 as the mingw installation) + Install [Jom](https://wiki.qt.io/Jom) to C:\Qt\4.8.6 (or anywhere in your path) 5. gcc 4.x, 5.x, or 6.x (or clang for OSX 10.9) On Windows gcc 4.x is included in the DevKit diff --git a/vendor/BuildQt4Win32.bat b/vendor/BuildQt4Win32.bat deleted file mode 100644 index e48b14a..0000000 --- a/vendor/BuildQt4Win32.bat +++ /dev/null @@ -1,10 +0,0 @@ -rmdir /s /q bin -mkdir bin -copy "C:\Devkit32\mingw\bin\libgcc_s_sjlj-1.dll" bin -copy "C:\Devkit32\mingw\bin\libstdc++-6.dll" bin -copy "C:\Devkit32\mingw\bin\libwinpthread-1.dll" bin -set INCLUDE=C:\Devkit32\mingw\i686-w64-mingw32\include; -set LIB=C:\Devkit32\mingw\i686-w64-mingw32\lib; -set PATH=C:\Devkit32\mingw\bin;%PATH% -call configure -opensource -confirm-license -release -platform win32-g++-4.6 -opengl desktop -webkit -openssl -qt-style-windowsxp -qt-style-windowsvista -I C:\OpenSSL-Win64\include -L C:\OpenSSL-Win64 -nomake examples -nomake demos -jom diff --git a/vendor/BuildQt4Win32Ruby24.bat b/vendor/BuildQt4Win32Ruby24.bat deleted file mode 100644 index bd16e0b..0000000 --- a/vendor/BuildQt4Win32Ruby24.bat +++ /dev/null @@ -1,10 +0,0 @@ -rmdir /s /q bin -mkdir bin -copy "C:\msys64\mingw32\bin\libgcc_s_dw2-1.dll" bin -copy "C:\msys64\mingw32\bin\libstdc++-6.dll" bin -copy "C:\msys64\mingw32\bin\libwinpthread-1.dll" bin -set INCLUDE=C:\msys64\mingw32\x86_64-w64-mingw32\include; -set LIB=C:\msys64\mingw32\i686-w64-mingw32\lib; -set PATH=C:\msys64\mingw32\bin;%PATH% -call configure -opensource -confirm-license -release -platform win32-g++-4.6 -opengl desktop -webkit -openssl -qt-style-windowsxp -qt-style-windowsvista -I C:\OpenSSL-Win64\include -L C:\OpenSSL-Win64 -nomake examples -nomake demos -jom diff --git a/vendor/BuildQt4Win64.bat b/vendor/BuildQt4Win64.bat index 984e818..ec50ebe 100644 --- a/vendor/BuildQt4Win64.bat +++ b/vendor/BuildQt4Win64.bat @@ -1,10 +1,19 @@ -rmdir /s /q bin -mkdir bin -copy "C:\Devkit64\mingw\bin\libgcc_s_sjlj-1.dll" bin -copy "C:\Devkit64\mingw\bin\libstdc++-6.dll" bin -copy "C:\Devkit64\mingw\bin\libwinpthread-1.dll" bin -set INCLUDE=C:\Devkit64\mingw\x86_64-w64-mingw32\include; -set LIB=C:\Devkit64\mingw\x86_64-w64-mingw32\lib; -set PATH=C:\Devkit64\mingw\bin;%PATH% +@echo on +SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION + +set CMAKE_PATH="C:\Program Files\CMake\bin" +set QT_PATH=C:\Qt\4.8.6 +set MINGW_PATH=C:\Ruby26-x64\msys64\mingw64 +set PERL_PATH=C:\Strawberry\perl\bin + +cd !QT_PATH! +copy "!MINGW_PATH!\bin\libgcc_s_seh-1.dll" bin +copy "!MINGW_PATH!\bin\libstdc++-6.dll" bin +copy "!MINGW_PATH!\bin\libwinpthread-1.dll" bin +set INCLUDE=!MINGW_PATH!\x86_64-w64-mingw32\include; +set LIB=!MINGW_PATH!\x86_64-w64-mingw32\lib; +set PATH=!MINGW_PATH!\bin;!QT_PATH!;!QT_PATH!\bin;!PERL_PATH! +echo !PATH! call configure -opensource -confirm-license -release -platform win32-g++-4.6 -opengl desktop -webkit -openssl -qt-style-windowsxp -qt-style-windowsvista -I C:\OpenSSL-Win64\include -L C:\OpenSSL-Win64 -nomake examples -nomake demos +call make clean jom diff --git a/vendor/BuildQt4Win64Ruby24.bat b/vendor/BuildQt4Win64Ruby24.bat deleted file mode 100644 index 978c3f6..0000000 --- a/vendor/BuildQt4Win64Ruby24.bat +++ /dev/null @@ -1,10 +0,0 @@ -rmdir /s /q bin -mkdir bin -copy "C:\msys64\mingw64\bin\libgcc_s_seh-1.dll" bin -copy "C:\msys64\mingw64\bin\libstdc++-6.dll" bin -copy "C:\msys64\mingw64\bin\libwinpthread-1.dll" bin -set INCLUDE=C:\msys64\mingw64\x86_64-w64-mingw32\include; -set LIB=C:\msys64\mingw64\x86_64-w64-mingw32\lib; -set PATH=C:\msys64\mingw64\bin;%PATH% -call configure -opensource -confirm-license -release -platform win32-g++-4.6 -opengl desktop -webkit -openssl -qt-style-windowsxp -qt-style-windowsvista -I C:\OpenSSL-Win64\include -L C:\OpenSSL-Win64 -nomake examples -nomake demos -jom diff --git a/vendor/BuildWindowsGems.bat b/vendor/BuildWindowsGems.bat index 8fd1a14..0715b91 100644 --- a/vendor/BuildWindowsGems.bat +++ b/vendor/BuildWindowsGems.bat @@ -1,18 +1,18 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: Builds Windows 32-bit and 64-bit gems for Windows +:: Builds Windows 64-bit gems for Windows :: Usage: BuildWindowsGems VERSION :: :: Make sure you have installed the following before running: :: a. Windows SDK for Windows version you are on :: b. Cmake -:: c. The 32-bit and 64-bit versions of msys2 for Ruby 2.4 -:: d. Qt built with msys for both 32-bit and 64-bit Ruby 2.4 -:: See BuildQt4Win32Ruby24.bat and BuildQt4Win64Ruby24.bat -:: e. Ruby version 2.4 both 32-bit and 64-bit version +:: c. The 64-bit versions of msys2 for Ruby 2.6 +:: d. Qt built with msys2 for 64-bit Ruby 2.6 +:: See BuildQt4Win64.bat +:: e. Ruby version 2.4, 2.5, 2.6 64-bit version :: f. Update all the paths below to your installations ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -@echo off +@echo on SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION IF [%1]==[] ( @@ -21,88 +21,46 @@ IF [%1]==[] ( ) else ( set COSMOS_INSTALL=%~1 ) -set MSYS64_32_PATH=C:\msys64 -set MSYS64_64_PATH=C:\msys64 -set QT_32_RUBY24_PATH=C:\Qt\4.8.6-Ruby24 -set Qt_64_RUBY24_PATH=C:\Qt\4.8.6-64-Ruby24 -set RUBY24_32_PATH=C:\Ruby242 -set RUBY24_64_PATH=C:\Ruby242-x64 -set RUBY25_32_PATH=C:\Ruby251 -set RUBY25_64_PATH=C:\Ruby251-x64 -:: Down to the main directory +set CMAKE_PATH="C:\Program Files\CMake\bin" +set QT_PATH=C:\Qt\4.8.6 +set RUBY24_64_PATH=C:\Ruby24-x64 +set RUBY25_64_PATH=C:\Ruby25-x64 +set RUBY26_64_PATH=C:\Ruby26-x64 +set MINGW_PATH=!RUBY26_64_PATH!\msys64\mingw64 +set QTBINDINGS_QT_PATH=!QT_PATH! +set PATH=!CMAKE_PATH!;!MINGW_PATH!\bin;!QT_PATH!\bin;!RUBY26_64_PATH!\bin + cd .. mkdir release -:: 32-bit version - :: Cleanup - -set QTBINDINGS_QT_PATH=!QT_32_RUBY24_PATH! -set PATH=!MSYS64_32_PATH!\mingw32\bin;!QT_32_RUBY24_PATH!\bin;!PATH! -set PATH=!RUBY24_32_PATH!\bin;!PATH! echo. echo Cleanup call ruby -e "puts RUBY_VERSION" echo. call rake distclean -:: Build 32-bit -echo. -echo Building 32-bit -echo. - +:: Build 64-bit echo. -echo Ruby -call ruby -e "puts RUBY_VERSION" +echo Building 64-bit echo. -call rake build -set PATH=!RUBY25_32_PATH!\bin;!PATH! +set PATH=!RUBY24_64_PATH!\bin;!PATH! echo. echo Ruby call ruby -e "puts RUBY_VERSION" echo. call rake build -echo. -echo Build 32-bit qtbindings gem -echo. -call rake VERSION=%1 gemnative - -echo. -echo Build 32-bit qtbindings-qt gem -echo. -call rake VERSION=%1 gemqt - -move *.gem release -move release\*.gemspec . - -:: 64-bit version - -:: Cleanup - -set QTBINDINGS_QT_PATH=!QT_64_RUBY24_PATH! -set PATH=!MSYS64_64_PATH!\mingw64\bin;!QT_64_RUBY24_PATH!\bin;!PATH! -set PATH=!RUBY24_64_PATH!\bin;!PATH! -echo. -echo Cleanup -call ruby -e "puts RUBY_VERSION" -echo. -call rake distclean - -:: Build 64-bit -echo. -echo Building 64-bit -echo. - +set PATH=!RUBY25_64_PATH!\bin;!PATH! echo. echo Ruby call ruby -e "puts RUBY_VERSION" echo. call rake build -set PATH=!RUBY25_64_PATH!\bin;!PATH! +set PATH=!RUBY26_64_PATH!\bin;!PATH! echo. echo Ruby call ruby -e "puts RUBY_VERSION"