diff --git a/5.6.2/compile_win.txt b/5.6.2/compile_win.txt index a332d27..35f6023 100644 --- a/5.6.2/compile_win.txt +++ b/5.6.2/compile_win.txt @@ -2,13 +2,17 @@ x86: 1. Запускаем qt5vars.cmd 2. cd qtbase - configure -opensource -opengl desktop -mp -nomake tests -nomake examples -target xp + configure -opensource -opengl desktop -mp -nomake tests -nomake examples -target xp -I "%cd%\openssl" -openssl-linked OPENSSL_LIBS_DEBUG="%cd%\openssl\debug\ssleay32.lib %cd%\openssl\debug\libeay32.lib" OPENSSL_LIBS_RELEASE="%cd%\openssl\release\ssleay32.lib %cd%\openssl\release\libeay32.lib" nmake 3. cd ..\qttools qmake nmake +XXX. cd ..\qtwinextras + qmake + nmake + 4. cd ..\qtbase nmake docs cd ..\qttools @@ -21,10 +25,14 @@ x64: 1. Запускаем qt5vars_x64.cmd 2. cd qtbase - configure -opensource -opengl desktop -mp -nomake tests -nomake examples -target xp + configure -opensource -opengl desktop -mp -nomake tests -nomake examples -target xp -I "%cd%\openssl_x64" -openssl-linked OPENSSL_LIBS_DEBUG="%cd%\openssl_x64\debug\ssleay32.lib %cd%\openssl_x64\debug\libeay32.lib" OPENSSL_LIBS_RELEASE="%cd%\openssl_x64\release\ssleay32.lib %cd%\openssl_x64\release\libeay32.lib" nmake -3. cd .. +3. cd ..\qttools + qmake + nmake + +4. cd .. cleanup.bat diff --git a/5.6.2/qtbase/mkspecs/common/msvc-desktop.conf b/5.6.2/qtbase/mkspecs/common/msvc-desktop.conf index 9f9f6dd..f78cb13 100644 --- a/5.6.2/qtbase/mkspecs/common/msvc-desktop.conf +++ b/5.6.2/qtbase/mkspecs/common/msvc-desktop.conf @@ -83,7 +83,7 @@ QMAKE_EXTENSION_STATICLIB = lib QMAKE_LIBS_CORE = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib QMAKE_LIBS_GUI = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib ws2_32.lib ole32.lib user32.lib advapi32.lib -QMAKE_LIBS_NETWORK = ws2_32.lib +QMAKE_LIBS_NETWORK = ws2_32.lib user32.lib gdi32.lib QMAKE_LIBS_OPENGL = glu32.lib opengl32.lib gdi32.lib user32.lib QMAKE_LIBS_OPENGL_ES2 = $${LIBEGL_NAME}.lib $${LIBGLESV2_NAME}.lib gdi32.lib user32.lib QMAKE_LIBS_OPENGL_ES2_DEBUG = $${LIBEGL_NAME}d.lib $${LIBGLESV2_NAME}d.lib gdi32.lib user32.lib diff --git a/_compile_openssl/compile.txt b/_compile_openssl/compile.txt new file mode 100644 index 0000000..b4d23ed --- /dev/null +++ b/_compile_openssl/compile.txt @@ -0,0 +1,29 @@ +Debug: + +perl Configure debug-VC-WIN32 no-asm +ms\do_ms +nmake -f ms\nt.mak +nmake -f ms\nt.mak install + +Release: + +perl Configure VC-WIN32 no-asm +ms\do_ms +nmake -f ms\nt.mak +nmake -f ms\nt.mak install + +x64: + +Debug: + +perl Configure debug-VC-WIN64A +ms\do_win64a +nmake -f ms\nt.mak +nmake -f ms\nt.mak install + +Release: + +perl Configure VC-WIN64A +ms\do_win64a +nmake -f ms\nt.mak +nmake -f ms\nt.mak install \ No newline at end of file diff --git a/_compile_openssl/openssl-1.0.2l.tar.gz b/_compile_openssl/openssl-1.0.2l.tar.gz new file mode 100644 index 0000000..72be295 Binary files /dev/null and b/_compile_openssl/openssl-1.0.2l.tar.gz differ