mirror of
https://github.com/ea4k/klog.git
synced 2024-09-21 10:28:06 +00:00
Build system update
This commit is contained in:
parent
83c188fe29
commit
0bbfa1408a
@ -52,170 +52,21 @@
|
||||
<distributionFile>
|
||||
<origin>../src/COPYING</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/D3Dcompiler_47.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/gpl-3.0-standalone.html</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/klog.exe</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../images/klog.ico</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/libcrypto-3.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/libeay32.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/libEGL.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/libgcc_s_dw2-1.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/libgcc_s_sjlj-1.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/libGLESv2.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/libhamlib-4.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/libssl-3.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/libstdc++-6.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/libusb-1.0.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/libwinpthread-1.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/NEWS</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/opengl32sw.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5Charts.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5Core.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5Gui.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5Location.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5Network.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5Positioning.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5PositioningQuick.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5PrintSupport.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5Qml.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5QmlModels.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5QmlWorkerScript.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5Quick.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5RemoteObjects.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5SerialPort.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5Sql.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5Svg.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5Widgets.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/README</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/ssleay32.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/bearer</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/geoservices</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/iconengines</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/imageformats</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/platforms</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/position</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/printsupport</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/qmltooling</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/QtLocation</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/QtPositioning</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/QtQml</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/QtQuick</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/QtQuick.2</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/sqldrivers</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/styles</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/translations</origin>
|
||||
</distributionDirectory>
|
||||
<distributionDirectory>
|
||||
<origin>../src/release/QtGraphicalEffects</origin>
|
||||
</distributionDirectory>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5QuickControls2.dll</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../src/release/Qt5QuickTemplates2.dll</origin>
|
||||
<allowWildcards>1</allowWildcards>
|
||||
<origin>../src/release/*</origin>
|
||||
</distributionFile>
|
||||
</distributionFileList>
|
||||
<shortcutList>
|
||||
|
@ -3,7 +3,7 @@ rem Script to deploy the windows package file
|
||||
rem Must be executed in the build directory of KLog
|
||||
rem ***************************************************************************
|
||||
rem
|
||||
rem klogwincreatepacksage2.bat
|
||||
rem win32-create-package.bat
|
||||
rem -------------------
|
||||
rem begin : jan 2021
|
||||
rem copyright : (C) 2021 by Jaime Robles
|
||||
@ -30,6 +30,7 @@ echo Setting up environment for Qt usage...
|
||||
set KLOGDEVELVERSION=1
|
||||
set PATH=%PATH%;C:\Qt\5.15.2\mingw81_32\bin;C:\Qt\Tools\mingw810_32\bin;
|
||||
set PATH=%PATH%;C:\Program Files\InstallBuilder Enterprise 23.10.1\bin;
|
||||
set PATH=%PATH%;C:\Program Files (x86)\BitRock InstallBuilder Enterprise 15.10.1\bin;
|
||||
echo Line 10
|
||||
cd ../src/
|
||||
rmdir /S /Q build
|
||||
@ -59,9 +60,9 @@ echo Line 43
|
||||
xcopy /Y /S /F build\target\* release
|
||||
echo localdir=%cd%
|
||||
echo %localdir%
|
||||
rem COPY OpenSSL-1 DLL
|
||||
copy ..\..\libs\win32\openssl\*.dll release
|
||||
copy ..\..\libs\win32\hamlib\*.dll release
|
||||
rem COPY OpenSSL DLL
|
||||
copy ..\..\..\libs\win32\openssl\bin\*.dll release
|
||||
copy ..\..\..\libs\win32\hamlib\bin\*.dll release
|
||||
windeployqt --qmldir release release\klog.exe
|
||||
:: The SSL DLLs must be included and must match the version that were used to build Qt.
|
||||
:: Check in main.cpp and uncomment the SSL line to see what is the version that was used.
|
||||
|
@ -29,7 +29,7 @@ rem ****************************************************************************
|
||||
echo Setting up environment for Qt usage...
|
||||
set KLOGDEVELVERSION=1
|
||||
set PATH=%PATH%;C:\Qt\5.15.2\mingw81_64\bin;C:\Qt\Tools\mingw810_64\bin;
|
||||
set PATH=%PATH%;C:\Program Files\InstallBuilder Enterprise 23.10.1\bin;
|
||||
set PATH=%PATH%;C:\Program Files\InstallBuilder Enterprise 23.11.1\bin;
|
||||
del ..\devscripts\klog-*win64*.exe
|
||||
echo Line 10
|
||||
cd ../src/
|
||||
|
Loading…
Reference in New Issue
Block a user